Make some internal shader loading helper functions private/static

diff --git a/libctru/include/3ds/gpu/enums.h b/libctru/include/3ds/gpu/enums.h
index 7cb5249ead2309d574bca732005f9755837826ae..ff05709866c8f1e9376214a5c83d213a898e288a 100644 (file)
--- a/libctru/include/3ds/gpu/enums.h
+++ b/libctru/include/3ds/gpu/enums.h
@@ -7,7 +7,7 @@
 #define GPU_TEXTURE_WRAP_T(v) (((v)&0x3)<<8) //takes a GPU_TEXTURE_WRAP_PARAM
 
 // Combiner buffer write config
-#define GPU_TEV_BUFFER_WRITE_CONFIG(stage0, stage1, stage2, stage3) (stage0 | (stage1 << 1) | (stage2 << 2) | (stage3 << 3))
+#define GPU_TEV_BUFFER_WRITE_CONFIG(stage0, stage1, stage2, stage3) ((stage0) | ((stage1) << 1) | ((stage2) << 2) | ((stage3) << 3))
 
 typedef enum
 {

diff --git a/libctru/include/3ds/gpu/shaderProgram.h b/libctru/include/3ds/gpu/shaderProgram.h
index c4062b1d1182b3b69e136135e50dfbb01020661f..e4a747aaf07e1193ae3188423e30291c99078ba0 100644 (file)
--- a/libctru/include/3ds/gpu/shaderProgram.h
+++ b/libctru/include/3ds/gpu/shaderProgram.h
@@ -38,7 +38,3 @@ Result shaderProgramFree(shaderProgram_s* sp);
 Result shaderProgramSetVsh(shaderProgram_s* sp, DVLE_s* dvle);\r
 Result shaderProgramSetGsh(shaderProgram_s* sp, DVLE_s* dvle, u8 stride);\r
 Result shaderProgramUse(shaderProgram_s* sp);\r
-\r
-void GPU_SetShaderOutmap(u32 outmapData[8]);\r
-void GPU_SendShaderCode(GPU_SHADER_TYPE type, u32* data, u16 offset, u16 length);\r
-void GPU_SendOperandDescriptors(GPU_SHADER_TYPE type, u32* data, u16 offset, u16 length);\r

diff --git a/libctru/source/gpu/shaderProgram.c b/libctru/source/gpu/shaderProgram.c
index 5d4db8843348f12204636e7490e632416ca56b63..5f548298bc33d4df92b4b29ee54e2a5ae517c06c 100644 (file)
--- a/libctru/source/gpu/shaderProgram.c
+++ b/libctru/source/gpu/shaderProgram.c
@@ -4,6 +4,10 @@
 #include <3ds/gpu/registers.h>\r
 #include <3ds/gpu/shaderProgram.h>\r
 \r
+static void GPU_SetShaderOutmap(u32 outmapData[8]);\r
+static void GPU_SendShaderCode(GPU_SHADER_TYPE type, u32* data, u16 offset, u16 length);\r
+static void GPU_SendOperandDescriptors(GPU_SHADER_TYPE type, u32* data, u16 offset, u16 length);\r
+\r
 Result shaderInstanceInit(shaderInstance_s* si, DVLE_s* dvle)\r
 {\r
        if(!si || !dvle)return -1;\r