Hi; Here's some fixes to GL_ARB_explicit_uniform_location patches and one additional patch (2) to help calculate location slots for glsl types correctly (was incorrect for matrices currently).
There is still a bit discussion ongoing on one of the patches and I left it out for now: http://lists.freedesktop.org/archives/mesa-dev/2014-May/059822.html Thanks; Tapani Pälli (5): mesa: add new enum MAX_UNIFORM_LOCATIONS glsl: add glsl_type::uniform_locations() helper function glsl/linker: initialize explicit uniform locations glsl/linker: assign explicit uniform locations mesa: support inactive uniforms in glUniform* functions src/glsl/glsl_types.cpp | 26 ++++++++ src/glsl/glsl_types.h | 6 ++ src/glsl/ir_uniform.h | 5 ++ src/glsl/link_uniforms.cpp | 61 +++++++++++++++++-- src/glsl/linker.cpp | 115 +++++++++++++++++++++++++++++++++++ src/mesa/main/context.c | 3 + src/mesa/main/get.c | 1 + src/mesa/main/get_hash_params.py | 1 + src/mesa/main/mtypes.h | 5 ++ src/mesa/main/tests/enum_strings.cpp | 1 + src/mesa/main/uniform_query.cpp | 15 +++++ 11 files changed, 234 insertions(+), 5 deletions(-) -- 1.8.3.1 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev