summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/context.c
diff options
context:
space:
mode:
authorPaul Berry <[email protected]>2014-01-09 11:32:00 -0800
committerPaul Berry <[email protected]>2014-01-21 20:25:47 -0800
commit5808c44bab52fdb58ad705e08e334c6f1acdd2ce (patch)
tree26e02e58181e89a512e5a5f8fc8423492c359e35 /src/mesa/main/context.c
parent69b258cb4636315b4c1aaaceeedd1eed8af98ba8 (diff)
mesa: Remove ad-hoc arrays of gl_shader_program.
Now that we have a ctx->Shader.CurrentProgram array, we can just use it directly. Reviewed-by: Chris Forbes <[email protected]> Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/main/context.c')
-rw-r--r--src/mesa/main/context.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index ec9f981e57a..7c3b2d74f7c 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1874,13 +1874,9 @@ _mesa_valid_to_render(struct gl_context *ctx, const char *where)
#ifdef DEBUG
if (ctx->Shader.Flags & GLSL_LOG) {
- struct gl_shader_program *shProg[MESA_SHADER_STAGES];
+ struct gl_shader_program **shProg = ctx->Shader.CurrentProgram;
gl_shader_stage i;
- shProg[MESA_SHADER_VERTEX] = ctx->Shader.CurrentProgram[MESA_SHADER_VERTEX];
- shProg[MESA_SHADER_GEOMETRY] = ctx->Shader.CurrentProgram[MESA_SHADER_GEOMETRY];
- shProg[MESA_SHADER_FRAGMENT] = ctx->Shader.CurrentProgram[MESA_SHADER_FRAGMENT];
-
for (i = 0; i < MESA_SHADER_STAGES; i++) {
if (shProg[i] == NULL || shProg[i]->_Used
|| shProg[i]->_LinkedShaders[i] == NULL)