Module: Mesa
Branch: master
Commit: 84732a982c3eeaca2e2809532c8422dc5f7045c1
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=84732a982c3eeaca2e2809532c8422dc5f7045c1
Author: Paul Berry <stereotype...@gmail.com>
Date: Wed Jan 8 10:00:28 2014 -0800
mesa: replace ctx->Const.{Vertex,Fragment,Geomtery}Program with an array.
These are replaced with
ctx->Const.Program[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' -o -iname '*.py' \
-o -iname '*.y' ')' -print0 | xargs -0 sed -i \
-e 's/Const\.VertexProgram/Const.Program[MESA_SHADER_VERTEX]/g' \
-e 's/Const\.GeometryProgram/Const.Program[MESA_SHADER_GEOMETRY]/g' \
-e 's/Const\.FragmentProgram/Const.Program[MESA_SHADER_FRAGMENT]/g'
Suggested-by: Brian Paul <bri...@vmware.com>
Reviewed-by: Brian Paul <bri...@vmware.com>
Reviewed-by: Kenneth Graunke <kenn...@whitecape.org>
---
src/glsl/ast_to_hir.cpp | 6 +-
src/glsl/builtin_variables.cpp | 4 +-
src/glsl/glsl_parser_extras.cpp | 28 +++---
src/glsl/link_atomics.cpp | 12 +--
src/glsl/link_varyings.cpp | 8 +-
src/glsl/linker.cpp | 24 ++---
src/glsl/main.cpp | 122 +++++++++++++-------------
src/glsl/standalone_scaffolding.cpp | 14 +--
src/mesa/drivers/dri/i915/i830_context.c | 2 +-
src/mesa/drivers/dri/i915/i915_context.c | 52 +++++------
src/mesa/drivers/dri/i965/brw_context.c | 98 ++++++++++-----------
src/mesa/drivers/dri/nouveau/nv04_context.c | 2 +-
src/mesa/drivers/dri/nouveau/nv10_context.c | 2 +-
src/mesa/drivers/dri/nouveau/nv20_context.c | 2 +-
src/mesa/drivers/dri/r200/r200_context.c | 12 +--
src/mesa/drivers/dri/r200/r200_state.c | 2 +-
src/mesa/drivers/dri/radeon/radeon_context.c | 2 +-
src/mesa/drivers/dri/radeon/radeon_state.c | 2 +-
src/mesa/main/arbprogram.c | 20 ++---
src/mesa/main/context.c | 26 +++---
src/mesa/main/ffvertex_prog.c | 2 +-
src/mesa/main/get.c | 10 +--
src/mesa/main/get_hash_params.py | 50 +++++------
src/mesa/main/mtypes.h | 4 +-
src/mesa/main/shader_query.cpp | 2 +-
src/mesa/main/shaderapi.c | 4 +-
src/mesa/main/texenv.c | 8 +-
src/mesa/main/varray.c | 24 ++---
src/mesa/main/version.c | 2 +-
src/mesa/program/program.c | 26 +++---
src/mesa/program/program_parse.y | 6 +-
src/mesa/state_tracker/st_atom_sampler.c | 6 +-
src/mesa/state_tracker/st_atom_texture.c | 8 +-
src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 2 +-
src/mesa/state_tracker/st_mesa_to_tgsi.c | 2 +-
src/mesa/swrast/s_context.c | 6 +-
src/mesa/swrast/s_texcombine.c | 2 +-
src/mesa/tnl/t_vb_program.c | 4 +-
38 files changed, 303 insertions(+), 305 deletions(-)
Diff:
http://cgit.freedesktop.org/mesa/mesa/diff/?id=84732a982c3eeaca2e2809532c8422dc5f7045c1
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
