Don't push uniforms if they've definitely not changed.

We could be more aggressive about this, but this probably catches most of the unnecessary pushing anyhow.
icculus · Aug 14, 2009 · ed6a87f · ed6a87f
1 parent c7e26ed
commit ed6a87f
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/mojoshader_opengl.c b/mojoshader_opengl.c
@@ -68,6 +68,7 @@ struct MOJOSHADER_glProgram
     MOJOSHADER_glShader *vertex;
     MOJOSHADER_glShader *fragment;
     GLuint handle;
+    uint32 generation;
     uint32 uniform_count;
     UniformMap *uniforms;
     uint32 attribute_count;
@@ -127,6 +128,9 @@ struct MOJOSHADER_glContext
     uint8 ps_reg_file_b[MAX_REG_FILE_B];
     GLuint sampler_reg_file[16];
 
+    // This increments every time we change the register files.
+    uint32 generation;
+
     // GL stuff...
     int opengl_major;
     int opengl_minor;
@@ -1485,6 +1489,7 @@ MOJOSHADER_glProgram *MOJOSHADER_glLinkProgram(MOJOSHADER_glShader *vshader,
     retval->handle = program;
     retval->vertex = vshader;
     retval->fragment = pshader;
+    retval->generation = ctx->generation - 1;
     retval->refcount = 1;
 
     if (vshader != NULL)
@@ -1597,6 +1602,7 @@ void MOJOSHADER_glSetVertexShaderUniformF(unsigned int idx, const float *data,
         assert(sizeof (GLfloat) == sizeof (float));
         const uint cpy = (minuint(maxregs - idx, vec4n) * sizeof (*data)) * 4;
         memcpy(ctx->vs_reg_file_f + (idx * 4), data, cpy);
+        ctx->generation++;
     } // if
 } // MOJOSHADER_glSetVertexShaderUniformF
 
@@ -1610,6 +1616,7 @@ void MOJOSHADER_glSetVertexShaderUniformI(unsigned int idx, const int *data,
         assert(sizeof (GLint) == sizeof (int));
         const uint cpy = (minuint(maxregs - idx, ivec4n) * sizeof (*data)) * 4;
         memcpy(ctx->vs_reg_file_i + (idx * 4), data, cpy);
+        ctx->generation++;
     } // if
 } // MOJOSHADER_glSetVertexShaderUniformI
 
@@ -1624,6 +1631,7 @@ void MOJOSHADER_glSetVertexShaderUniformB(unsigned int idx, const int *data,
         uint8 *endptr = wptr + minuint(maxregs - idx, bcount);
         while (wptr != endptr)
             *(wptr++) = *(data++) ? 1 : 0;
+        ctx->generation++;
     } // if
 } // MOJOSHADER_glSetVertexShaderUniformB
 
@@ -1637,6 +1645,7 @@ void MOJOSHADER_glSetPixelShaderUniformF(unsigned int idx, const float *data,
         assert(sizeof (GLfloat) == sizeof (float));
         const uint cpy = (minuint(maxregs - idx, vec4n) * sizeof (*data)) * 4;
         memcpy(ctx->ps_reg_file_f + (idx * 4), data, cpy);
+        ctx->generation++;
     } // if
 } // MOJOSHADER_glSetPixelShaderUniformF
 
@@ -1650,6 +1659,7 @@ void MOJOSHADER_glSetPixelShaderUniformI(unsigned int idx, const int *data,
         assert(sizeof (GLint) == sizeof (int));
         const uint cpy = (minuint(maxregs - idx, ivec4n) * sizeof (*data)) * 4;
         memcpy(ctx->ps_reg_file_i + (idx * 4), data, cpy);
+        ctx->generation++;
     } // if
 } // MOJOSHADER_glSetPixelShaderUniformI
 
@@ -1664,6 +1674,7 @@ void MOJOSHADER_glSetPixelShaderUniformB(unsigned int idx, const int *data,
         uint8 *endptr = wptr + minuint(maxregs - idx, bcount);
         while (wptr != endptr)
             *(wptr++) = *(data++) ? 1 : 0;
+        ctx->generation++;
     } // if
 } // MOJOSHADER_glSetPixelShaderUniformB
 
@@ -1739,13 +1750,13 @@ void MOJOSHADER_glSetVertexAttribute(MOJOSHADER_usage usage,
 
 void MOJOSHADER_glProgramReady(void)
 {
-    const MOJOSHADER_glProgram *program = ctx->bound_program;
+    MOJOSHADER_glProgram *program = ctx->bound_program;
 
     if (program == NULL)
         return;  // nothing to do.
 
     // push Uniforms to the program from our register files...
-    if (program->uniform_count > 0)
+    if ((program->uniform_count) && (program->generation != ctx->generation))
     {
         // vertex shader uniforms come first in program->uniforms array.
         const uint32 count = program->uniform_count;
@@ -1758,6 +1769,8 @@ void MOJOSHADER_glProgramReady(void)
         GLint *dstb = program->vs_uniforms_bool;
         uint32 i;
 
+        program->generation = ctx->generation;
+
         for (i = 0; i < count; i++)
         {
             UniformMap *map = &program->uniforms[i];