GPU_DepthRange() -> GPU_DepthMap()

diff --git a/examples/gpu/source/main.c b/examples/gpu/source/main.c
index 411d7aaeef41e86068508140ff97cf2d2fd09c0c..c42849e95bb35bbc404b5a75bd9acb27bd0fa295 100644 (file)
--- a/examples/gpu/source/main.c
+++ b/examples/gpu/source/main.c
@@ -130,7 +130,7 @@ void renderFrame()
 {
        GPU_SetViewport((u32*)osConvertVirtToPhys((u32)gpuDOut),(u32*)osConvertVirtToPhys((u32)gpuOut),0,0,240*2,400);
 
-       GPU_DepthRange(-1.0f, 0.0f);
+       GPU_DepthMap(-1.0f, 0.0f);
        GPU_SetFaceCulling(GPU_CULL_BACK_CCW);
        GPU_SetStencilTest(false, GPU_ALWAYS, 0x00, 0xFF, 0x00);
        GPU_SetStencilOp(GPU_KEEP, GPU_KEEP, GPU_KEEP);

diff --git a/libctru/include/3ds/gpu/gpu.h b/libctru/include/3ds/gpu/gpu.h
index 932a48a8434f21c94410ad55a9d1162383151d01..8d59c4d5fe8fe6d525bc0614e504c18134d15e89 100644 (file)
--- a/libctru/include/3ds/gpu/gpu.h
+++ b/libctru/include/3ds/gpu/gpu.h
@@ -214,7 +214,7 @@ void GPU_SetViewport(u32* depthBuffer, u32* colorBuffer, u32 x, u32 y, u32 w, u3
 
 void GPU_SetScissorTest(GPU_SCISSORMODE mode, u32 x, u32 y, u32 w, u32 h);
 
-void GPU_DepthRange(float nearVal, float farVal);
+void GPU_DepthMap(float zScale, float zOffset);
 void GPU_SetAlphaTest(bool enable, GPU_TESTFUNC function, u8 ref);
 void GPU_SetDepthTestAndWriteMask(bool enable, GPU_TESTFUNC function, GPU_WRITEMASK writemask); // GPU_WRITEMASK values can be ORed together
 void GPU_SetStencilTest(bool enable, GPU_TESTFUNC function, u8 ref, u8 mask, u8 replace);

diff --git a/libctru/include/3ds/gpu/registers.h b/libctru/include/3ds/gpu/registers.h
index 1390a8fc828850c3909f684e1e8054bb6a259c3d..89cd3786c108f5b1ab8d625e02e63fa8138a5780 100644 (file)
--- a/libctru/include/3ds/gpu/registers.h
+++ b/libctru/include/3ds/gpu/registers.h
@@ -77,8 +77,8 @@
 #define GPUREG_004A 0x004A\r
 #define GPUREG_004B 0x004B\r
 #define GPUREG_004C 0x004C\r
-#define GPUREG_DEPTHRANGE_NEAR 0x004D\r
-#define GPUREG_DEPTHRANGE_FAR 0x004E\r
+#define GPUREG_DEPTHMAP_SCALE 0x004D\r
+#define GPUREG_DEPTHMAP_OFFSET 0x004E\r
 #define GPUREG_SH_OUTMAP_TOTAL 0x004F\r
 #define GPUREG_SH_OUTMAP_O0 0x0050\r
 #define GPUREG_SH_OUTMAP_O1 0x0051\r

diff --git a/libctru/source/gpu/gpu.c b/libctru/source/gpu/gpu.c
index f05ab9de100008b072c90ed76022d75762e6a6ba..c913bc9ec6cfcdb9f80449cc2c0ad363bbfc75fc 100644 (file)
--- a/libctru/source/gpu/gpu.c
+++ b/libctru/source/gpu/gpu.c
@@ -317,11 +317,11 @@ void GPU_SetScissorTest(GPU_SCISSORMODE mode, u32 x, u32 y, u32 w, u32 h)
        GPUCMD_AddIncrementalWrites(GPUREG_SCISSORTEST_MODE, param, 0x00000003);
 }
 
-void GPU_DepthRange(float nearVal, float farVal)
+void GPU_DepthMap(float zScale, float zOffset)
 {
        GPUCMD_AddWrite(GPUREG_006D, 0x00000001); //?
-       GPUCMD_AddWrite(GPUREG_DEPTHRANGE_NEAR, f32tof24(nearVal));
-       GPUCMD_AddWrite(GPUREG_DEPTHRANGE_FAR, f32tof24(farVal));
+       GPUCMD_AddWrite(GPUREG_DEPTHMAP_SCALE, f32tof24(zScale));
+       GPUCMD_AddWrite(GPUREG_DEPTHMAP_OFFSET, f32tof24(zOffset));
 }
 
 void GPU_SetAlphaTest(bool enable, GPU_TESTFUNC function, u8 ref)