This is the next in my series of internal shader API cleaning. The primary purpose of this series is to remove the extra tracking of Mesa IR shaders. The gl_shader_program has a reference to the Mesa IR shader for each stage, and the entry in gl_shader_program::_LinkedShaders has a reference to the same Mesa IR.
The first three patches eliminate the extra references, and the remaining six implement some refactors and clean-ups enabled by the first three. src/glsl/ir.cpp | 8 --- src/glsl/ir.h | 8 --- src/mesa/drivers/dri/i965/brw_fs.cpp | 8 ++- src/mesa/drivers/dri/i965/brw_fs.h | 3 +- src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 3 +- src/mesa/drivers/dri/i965/brw_vs.c | 8 ++- src/mesa/drivers/dri/i965/brw_wm.c | 2 +- src/mesa/main/context.c | 8 +-- src/mesa/main/ff_fragment_shader.cpp | 10 ++-- src/mesa/main/mtypes.h | 3 - src/mesa/main/shaderapi.c | 32 +++++------ src/mesa/main/shaderobj.c | 4 - src/mesa/main/state.c | 18 ++++-- src/mesa/main/texstate.c | 18 +++--- src/mesa/main/uniforms.c | 42 +++++++++----- src/mesa/program/ir_to_mesa.cpp | 37 ++++-------- src/mesa/program/prog_uniform.c | 74 ------------------------ src/mesa/program/prog_uniform.h | 4 - src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 44 ++++----------- src/mesa/state_tracker/st_program.c | 9 +-- 20 files changed, 111 insertions(+), 232 deletions(-) _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
