diff options
| author | Paul Berry <stereotype441@gmail.com> | 2014-01-09 11:16:27 -0800 |
|---|---|---|
| committer | Paul Berry <stereotype441@gmail.com> | 2014-01-21 20:25:02 -0800 |
| commit | 3b22146dc714b6090f7423abbc4df53d7d1fdaa9 (patch) | |
| tree | b59bef08624870671092f9906585869f6f9aeac9 /src/mesa/swrast | |
| parent | cd18ba1c7aba66f2dd7cdbe2cf3b4a803c241d10 (diff) | |
| download | external_mesa3d-3b22146dc714b6090f7423abbc4df53d7d1fdaa9.zip external_mesa3d-3b22146dc714b6090f7423abbc4df53d7d1fdaa9.tar.gz external_mesa3d-3b22146dc714b6090f7423abbc4df53d7d1fdaa9.tar.bz2 | |
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 <chrisf@ijw.co.nz>
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa/swrast')
| -rw-r--r-- | src/mesa/swrast/s_fragprog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c index 4e9ac39..fa45fa9 100644 --- a/src/mesa/swrast/s_fragprog.c +++ b/src/mesa/swrast/s_fragprog.c @@ -182,7 +182,7 @@ init_machine(struct gl_context *ctx, struct gl_program_machine *machine, machine->Samplers = program->Base.SamplerUnits; /* if running a GLSL program (not ARB_fragment_program) */ - if (ctx->Shader.CurrentFragmentProgram) { + if (ctx->Shader.CurrentProgram[MESA_SHADER_FRAGMENT]) { /* Store front/back facing value */ machine->Attribs[VARYING_SLOT_FACE][col][0] = 1.0F - span->facing; } |