The branch, master has been updated Commits at: http://cgit.freedesktop.org/mesa/mesa/log/?h=master
Summary of changes: src/mesa/main/config.h | 1 + src/mesa/main/mtypes.h | 14 +- src/mesa/shader/prog_execute.c | 8 +- src/mesa/shader/prog_execute.h | 2 + src/mesa/shader/prog_instruction.c | 211 ++++++++++------- src/mesa/shader/prog_instruction.h | 12 +- src/mesa/shader/prog_parameter.c | 40 +++- src/mesa/shader/prog_parameter.h | 12 +- src/mesa/shader/prog_uniform.c | 157 ++++++++++++ src/mesa/shader/prog_uniform.h | 91 +++++++ src/mesa/shader/program.c | 209 +++++++++++++++- src/mesa/shader/program.h | 10 + src/mesa/shader/programopt.c | 117 ++++++++- src/mesa/shader/programopt.h | 2 + src/mesa/shader/shader_api.c | 423 ++++++++++++++++---------------- src/mesa/shader/slang/slang_codegen.c | 10 +- src/mesa/shader/slang/slang_compile.c | 18 ++ src/mesa/shader/slang/slang_emit.c | 6 +- src/mesa/shader/slang/slang_link.c | 236 +++++------------- src/mesa/shader/slang/slang_link.h | 4 - src/mesa/shader/slang/slang_typeinfo.h | 1 + src/mesa/sources | 1 + src/mesa/swrast/s_fragprog.c | 14 +- src/mesa/swrast/s_span.c | 1 - 24 files changed, 1079 insertions(+), 521 deletions(-) create mode 100644 src/mesa/shader/prog_uniform.c create mode 100644 src/mesa/shader/prog_uniform.h via ade508312c701ce89d3c2cd717994dbbabb4f207 (commit) via c807c1a23fc918591e9d2f6f26c4e071a725bced (commit) via e0f160663e50d0481afd8a9e1ec90c334be489e1 (commit) via bff695b926249ead1944eef2aa05b2e0eaf9ba7f (commit) via 6ca948a303e1af7ae66ea7082af741f6880887f2 (commit) via 19ad9cf7741c641bd83d20485b32d11fe27ca8df (commit) via 450136d368ce7a08cf25992c79b51f51f8a9bb7c (commit) from 57e222d6e5ef5744491d093475e1136aedf81810 (commit) - Commits ----------------------------------------------- commit ade508312c701ce89d3c2cd717994dbbabb4f207 Author: Brian Paul <[EMAIL PROTECTED]> Date: Wed May 14 16:09:46 2008 -0600 Updated GLSL uniform/sampler handling from gallium-0.1 branch Previously, the shader linker combined the uniforms used by the vertex and fragment shaders into a combined set of uniforms. This made the implementation of glUniform*() simple, but was rather inefficient otherwise. Now each shader gets its own set of uniforms (no more modelview matrix showing up in the fragment shader uniforms, for example). cherry-picked by hand from gallium-0.1 branch commit c807c1a23fc918591e9d2f6f26c4e071a725bced Author: Brian Paul <[EMAIL PROTECTED]> Date: Wed May 14 13:12:44 2008 -0600 mesa: new functions for managing list/index of uniforms cherry-picked from gallium-0.1 commit e0f160663e50d0481afd8a9e1ec90c334be489e1 Author: Brian Paul <[EMAIL PROTECTED]> Date: Wed May 14 13:01:13 2008 -0600 clean-up swizzle fields in fog code, fix NegateBase cherry-picked from gallium-0.1 commit bff695b926249ead1944eef2aa05b2e0eaf9ba7f Author: Brian Paul <[EMAIL PROTECTED]> Date: Wed May 14 13:00:27 2008 -0600 sync up with gallium-0.1 changes New _mesa_num_inst_dst_regs(), _mesa_is_tex_instruction() functions commit 6ca948a303e1af7ae66ea7082af741f6880887f2 Author: Brian Paul <[EMAIL PROTECTED]> Date: Wed May 14 12:53:03 2008 -0600 added _mesa_combine_parameter_lists() cherry-picked from gallium-0.1 commit 19ad9cf7741c641bd83d20485b32d11fe27ca8df Author: Brian Paul <[EMAIL PROTECTED]> Date: Wed May 14 12:39:41 2008 -0600 mesa: added _mesa_insert_instructions() Also, use new _mesa_free_instructions() in a few places. cherry-picked from gallium-0.1 commit 450136d368ce7a08cf25992c79b51f51f8a9bb7c Author: Brian Paul <[EMAIL PROTECTED]> Date: Wed May 14 12:37:07 2008 -0600 mesa: added _mesa_free_instructions() cherry-picked from gallium-0.1 --------------------------------- _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit