From 791e7ed4dbbb22d224848c07de84129a39024fb2 Mon Sep 17 00:00:00 2001 From: smea Date: Sat, 15 Mar 2014 21:00:37 +0100 Subject: [PATCH] SHDR : updated DVLE_SendOutmap --- libctru/include/ctr/GPU.h | 20 ++++++++++---------- libctru/source/GPU.c | 2 +- libctru/source/SHDR.c | 3 +++ 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/libctru/include/ctr/GPU.h b/libctru/include/ctr/GPU.h index d1eac52..14ce15d 100644 --- a/libctru/include/ctr/GPU.h +++ b/libctru/include/ctr/GPU.h @@ -28,20 +28,20 @@ typedef enum{ typedef enum { - GL_NEVER = 0, - GL_ALWAYS = 1, - GL_EQUAL = 2, - GL_NOTEQUAL = 3, - GL_LESS = 4, - GL_LEQUAL = 5, - GL_GREATER = 6, - GL_GEQUAL = 7 -}GPU_TestFunction; + GPU_NEVER = 0, + GPU_ALWAYS = 1, + GPU_EQUAL = 2, + GPU_NOTEQUAL = 3, + GPU_LESS = 4, + GPU_LEQUAL = 5, + GPU_GREATER = 6, + GPU_GEQUAL = 7 +}GPU_TESTFUNC; void GPU_SetUniform(u32 startreg, u32* data, u32 numreg); void GPU_SetViewport(u32* depthBuffer, u32* colorBuffer, u32 x, u32 y, u32 w, u32 h); void GPU_DepthRange(float nearVal, float farVal); -void GPU_SetDepthTest(bool enable, GPU_TestFunction function, u8 ref); +void GPU_SetDepthTest(bool enable, GPU_TESTFUNC function, u8 ref); void GPU_SetTexture(u32* data, u16 width, u16 height, u32 param, GPU_TEXCOLOR colorType); #endif diff --git a/libctru/source/GPU.c b/libctru/source/GPU.c index 558a4c7..6c8ca5d 100644 --- a/libctru/source/GPU.c +++ b/libctru/source/GPU.c @@ -276,7 +276,7 @@ void GPU_DepthRange(float nearVal, float farVal) GPUCMD_AddSingleParam(0x000F004E, f32tof24(farVal)); } -void GPU_SetDepthTest(bool enable, GPU_TestFunction function, u8 ref) +void GPU_SetDepthTest(bool enable, GPU_TESTFUNC function, u8 ref) { GPUCMD_AddSingleParam(0x000F0107, (enable&1)|((function&7)<<4)|(ref<<8)); } diff --git a/libctru/source/SHDR.c b/libctru/source/SHDR.c index 3c808dd..672e8ed 100644 --- a/libctru/source/SHDR.c +++ b/libctru/source/SHDR.c @@ -131,6 +131,9 @@ void DVLE_SendOutmap(DVLE_s* dvle) { case RESULT_POSITION: *out=0x03020100; break; case RESULT_COLOR: *out=0x0B0A0908; break; + case RESULT_TEXCOORD0: *out=0x1F1F0D0C; break; + case RESULT_TEXCOORD1: *out=0x1F1F0F0E; break; + case RESULT_TEXCOORD2: *out=0x1F1F1716; break; } }