The branch, master has been updated
Commits at: http://cgit.freedesktop.org/mesa/mesa/log/?h=master
Summary of changes:
progs/glsl/Makefile | 8 +
progs/glsl/multitex.c | 285 +++++++++++++++++++++
progs/glsl/multitex.frag.txt | 15 +
progs/glsl/{simple.vert.txt => multitex.vert.txt} | 3 +-
src/mesa/shader/prog_parameter.c | 20 +-
src/mesa/shader/prog_parameter.h | 2 +-
src/mesa/shader/slang/slang_codegen.c | 3 +-
src/mesa/shader/slang/slang_compile.c | 3 -
src/mesa/shader/slang/slang_typeinfo.h | 1 -
9 files changed, 325 insertions(+), 15 deletions(-)
create mode 100644 progs/glsl/multitex.c
create mode 100644 progs/glsl/multitex.frag.txt
copy progs/glsl/{simple.vert.txt => multitex.vert.txt} (59%)
via 4978953c7962f33fa1eddbe75e5ef3736fbe7f06 (commit)
via b6fb0940c226373ac235a5d327d3fcfd742bc6b9 (commit)
from c6b36e5498cf6593daf001123cacec4ccaf305ca (commit)
- Commits -----------------------------------------------
commit 4978953c7962f33fa1eddbe75e5ef3736fbe7f06
Author: Brian Paul <[EMAIL PROTECTED]>
Date: Tue May 20 11:01:17 2008 -0600
new multi-texture GLSL test
commit b6fb0940c226373ac235a5d327d3fcfd742bc6b9
Author: Brian Paul <[EMAIL PROTECTED]>
Date: Tue May 20 10:59:18 2008 -0600
fix incorrect sampler numbering/indexing.
All samplers indexes were zero.
---------------------------------
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
