diff options
author | Paul Berry <[email protected]> | 2014-01-09 11:16:27 -0800 |
---|---|---|
committer | Paul Berry <[email protected]> | 2014-01-21 20:25:02 -0800 |
commit | 3b22146dc714b6090f7423abbc4df53d7d1fdaa9 (patch) | |
tree | b59bef08624870671092f9906585869f6f9aeac9 /src/mesa/state_tracker/st_program.c | |
parent | cd18ba1c7aba66f2dd7cdbe2cf3b4a803c241d10 (diff) |
mesa: Replace ctx->Shader.Current{Vertex,Fragment,Geometry}Program with an array.
These are replaced with
ctx->Shader.CurrentProgram[MESA_SHADER_{VERTEX,FRAGMENT,GEOMETRY}].
In patches to follow, this will allow us to replace a lot of ad-hoc
logic with a variable index into the array.
With the exception of the changes to mtypes.h, this patch was
generated entirely by the command:
find src -type f '(' -iname '*.c' -o -iname '*.cpp' ')' \
-print0 | xargs -0 sed -i \
-e 's/\.CurrentVertexProgram/.CurrentProgram[MESA_SHADER_VERTEX]/g' \
-e 's/\.CurrentGeometryProgram/.CurrentProgram[MESA_SHADER_GEOMETRY]/g' \
-e 's/\.CurrentFragmentProgram/.CurrentProgram[MESA_SHADER_FRAGMENT]/g'
Reviewed-by: Chris Forbes <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker/st_program.c')
-rw-r--r-- | src/mesa/state_tracker/st_program.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c index 2d6d430990a..1a00c314dda 100644 --- a/src/mesa/state_tracker/st_program.c +++ b/src/mesa/state_tracker/st_program.c @@ -1196,9 +1196,9 @@ void st_print_shaders(struct gl_context *ctx) { struct gl_shader_program *shProg[3] = { - ctx->Shader.CurrentVertexProgram, - ctx->Shader.CurrentGeometryProgram, - ctx->Shader.CurrentFragmentProgram, + ctx->Shader.CurrentProgram[MESA_SHADER_VERTEX], + ctx->Shader.CurrentProgram[MESA_SHADER_GEOMETRY], + ctx->Shader.CurrentProgram[MESA_SHADER_FRAGMENT], }; unsigned j; |