From: fincs <fincs.alt1@gmail.com>
Date: Sat, 5 Sep 2015 18:30:24 +0000 (+0200)
Subject: Make some internal shader loading helper functions private/static
X-Git-Tag: v1.0.0~129
X-Git-Url: https://chaos.moe/g/?a=commitdiff_plain;h=604b1f4b4396005ea6cf70165993b060efbc6714;p=corbenik%2Fctrulib.git

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 7cb5249..ff05709 100644
--- 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 c4062b1..e4a747a 100644
--- 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);
 Result shaderProgramSetGsh(shaderProgram_s* sp, DVLE_s* dvle, u8 stride);
 Result shaderProgramUse(shaderProgram_s* sp);
-
-void GPU_SetShaderOutmap(u32 outmapData[8]);
-void GPU_SendShaderCode(GPU_SHADER_TYPE type, u32* data, u16 offset, u16 length);
-void GPU_SendOperandDescriptors(GPU_SHADER_TYPE type, u32* data, u16 offset, u16 length);
diff --git a/libctru/source/gpu/shaderProgram.c b/libctru/source/gpu/shaderProgram.c
index 5d4db88..5f54829 100644
--- a/libctru/source/gpu/shaderProgram.c
+++ b/libctru/source/gpu/shaderProgram.c
@@ -4,6 +4,10 @@
 #include <3ds/gpu/registers.h>
 #include <3ds/gpu/shaderProgram.h>
 
+static void GPU_SetShaderOutmap(u32 outmapData[8]);
+static void GPU_SendShaderCode(GPU_SHADER_TYPE type, u32* data, u16 offset, u16 length);
+static void GPU_SendOperandDescriptors(GPU_SHADER_TYPE type, u32* data, u16 offset, u16 length);
+
 Result shaderInstanceInit(shaderInstance_s* si, DVLE_s* dvle)
 {
 	if(!si || !dvle)return -1;