Переглянути джерело

Removed "u_colorTable" uniform from the GLES2 renderer. It's not used anywhere.

Ryan C. Gordon 12 роки тому
батько
коміт
500e4f6f9a
1 змінених файлів з 2 додано та 5 видалено
  1. 2 5
      src/render/opengles2/SDL_render_gles2.c

+ 2 - 5
src/render/opengles2/SDL_render_gles2.c

@@ -122,8 +122,7 @@ typedef enum
     GLES2_UNIFORM_PROJECTION,
     GLES2_UNIFORM_PROJECTION,
     GLES2_UNIFORM_TEXTURE,
     GLES2_UNIFORM_TEXTURE,
     GLES2_UNIFORM_MODULATION,
     GLES2_UNIFORM_MODULATION,
-    GLES2_UNIFORM_COLOR,
-    GLES2_UNIFORM_COLORTABLE
+    GLES2_UNIFORM_COLOR
 } GLES2_Uniform;
 } GLES2_Uniform;
 
 
 typedef enum
 typedef enum
@@ -721,9 +720,7 @@ GLES2_CacheProgram(SDL_Renderer *renderer, GLES2_ShaderCacheEntry *vertex,
     entry->uniform_locations[GLES2_UNIFORM_MODULATION] =
     entry->uniform_locations[GLES2_UNIFORM_MODULATION] =
         data->glGetUniformLocation(entry->id, "u_modulation");
         data->glGetUniformLocation(entry->id, "u_modulation");
     entry->uniform_locations[GLES2_UNIFORM_COLOR] =
     entry->uniform_locations[GLES2_UNIFORM_COLOR] =
-        data->glGetUniformLocation(entry->id, "u_color");
-    entry->uniform_locations[GLES2_UNIFORM_COLORTABLE] =
-        data->glGetUniformLocation(entry->id, "u_colorTable");
+        rdata->glGetUniformLocation(entry->id, "u_color");
 
 
     /* Cache the linked program */
     /* Cache the linked program */
     if (data->program_cache.head)
     if (data->program_cache.head)