some more state caching for gl3

aap · May 14, 2020 · 90ce0f9 · 90ce0f9
1 parent 3b385c4
commit 90ce0f9
Show file tree

Hide file tree

Showing 9 changed files with 245 additions and 124 deletions.
diff --git a/src/gl/gl2_shaders/header.frag b/src/gl/gl2_shaders/header.frag
@@ -1,11 +1,13 @@
 uniform vec2 u_alphaRef;
 
-uniform float u_fogStart;
-uniform float u_fogEnd;
-uniform float u_fogRange;
-uniform float u_fogDisable;
+uniform vec4  u_fogData;
 uniform vec4  u_fogColor;
 
+#define u_fogStart (u_fogData.x)
+#define u_fogEnd (u_fogData.y)
+#define u_fogRange (u_fogData.z)
+#define u_fogDisable (u_fogData.w)
+
 void DoAlphaTest(float a)
 {
 	if(a < u_alphaRef.x || a >= u_alphaRef.y)

diff --git a/src/gl/gl2_shaders/header.vert b/src/gl/gl2_shaders/header.vert
@@ -1,10 +1,12 @@
 // State
-uniform float u_fogStart;
-uniform float u_fogEnd;
-uniform float u_fogRange;
-uniform float u_fogDisable;
+uniform vec4  u_fogData;
 //uniform vec4  u_fogColor;
 
+#define u_fogStart (u_fogData.x)
+#define u_fogEnd (u_fogData.y)
+#define u_fogRange (u_fogData.z)
+#define u_fogDisable (u_fogData.w)
+
 // Scene
 uniform mat4 u_proj;
 uniform mat4 u_view;

diff --git a/src/gl/gl2_shaders/header_fs.inc b/src/gl/gl2_shaders/header_fs.inc
@@ -1,12 +1,14 @@
 const char *header_frag_src =
 "uniform vec2 u_alphaRef;\n"
 
-"uniform float u_fogStart;\n"
-"uniform float u_fogEnd;\n"
-"uniform float u_fogRange;\n"
-"uniform float u_fogDisable;\n"
+"uniform vec4  u_fogData;\n"
 "uniform vec4  u_fogColor;\n"
 
+"#define u_fogStart (u_fogData.x)\n"
+"#define u_fogEnd (u_fogData.y)\n"
+"#define u_fogRange (u_fogData.z)\n"
+"#define u_fogDisable (u_fogData.w)\n"
+
 "void DoAlphaTest(float a)\n"
 "{\n"
 "	if(a < u_alphaRef.x || a >= u_alphaRef.y)\n"

diff --git a/src/gl/gl2_shaders/header_vs.inc b/src/gl/gl2_shaders/header_vs.inc
@@ -1,11 +1,13 @@
 const char *header_vert_src =
 "// State\n"
-"uniform float u_fogStart;\n"
-"uniform float u_fogEnd;\n"
-"uniform float u_fogRange;\n"
-"uniform float u_fogDisable;\n"
+"uniform vec4  u_fogData;\n"
 "//uniform vec4  u_fogColor;\n"
 
+"#define u_fogStart (u_fogData.x)\n"
+"#define u_fogEnd (u_fogData.y)\n"
+"#define u_fogRange (u_fogData.z)\n"
+"#define u_fogDisable (u_fogData.w)\n"
+
 "// Scene\n"
 "uniform mat4 u_proj;\n"
 "uniform mat4 u_view;\n"