The branch, master has been updated
Commits at: http://cgit.freedesktop.org/mesa/mesa/log/?h=master
Summary of changes:
Makefile | 13 +-
progs/glsl/CH06-brick.frag | 36 +
progs/glsl/CH06-brick.frag.txt | 36 -
progs/glsl/CH06-brick.vert | 41 +
progs/glsl/CH06-brick.vert.txt | 41 -
progs/glsl/CH11-bumpmap.frag | 41 +
progs/glsl/CH11-bumpmap.frag.txt | 41 -
progs/glsl/CH11-bumpmap.vert | 38 +
progs/glsl/CH11-bumpmap.vert.txt | 38 -
progs/glsl/CH11-toyball.frag | 75 +
progs/glsl/CH11-toyball.frag.txt | 75 -
progs/glsl/CH11-toyball.vert | 24 +
progs/glsl/CH11-toyball.vert.txt | 24 -
progs/glsl/CH18-mandel.frag | 55 +
progs/glsl/CH18-mandel.frag.txt | 55 -
progs/glsl/CH18-mandel.vert | 35 +
progs/glsl/CH18-mandel.vert.txt | 35 -
progs/glsl/Makefile | 8 +
progs/glsl/brick.c | 4 +-
progs/glsl/bump.c | 4 +-
progs/glsl/convolution.frag | 21 +
progs/glsl/convolution.vert | 5 +
progs/glsl/convolutions.c | 469 ++++++
progs/glsl/cubemap.frag | 18 +
progs/glsl/cubemap.frag.txt | 18 -
progs/glsl/mandelbrot.c | 4 +-
progs/glsl/multitex.c | 4 +-
progs/glsl/multitex.frag | 15 +
progs/glsl/multitex.frag.txt | 15 -
progs/glsl/multitex.vert | 10 +
progs/glsl/multitex.vert.txt | 10 -
progs/glsl/reflect.vert | 19 +
progs/glsl/reflect.vert.txt | 19 -
progs/glsl/shadowtex.frag | 21 +
progs/glsl/shadowtex.frag.txt | 21 -
progs/glsl/simple.vert | 9 +
progs/glsl/simple.vert.txt | 9 -
progs/glsl/texdemo1.c | 8 +-
progs/glsl/toyball.c | 4 +-
src/mesa/main/version.h | 2 +-
src/mesa/shader/programopt.c | 12 +-
src/mesa/shader/slang/library/slang_120_core_gc.h | 1332 ++++++++--------
.../slang/library/slang_builtin_120_common_gc.h | 188 ++--
.../slang/library/slang_builtin_120_fragment_gc.h | 2 +-
.../shader/slang/library/slang_common_builtin.gc | 183 ++--
.../shader/slang/library/slang_common_builtin_gc.h | 1589 ++++++++++----------
src/mesa/shader/slang/library/slang_core.gc | 301 ++--
src/mesa/shader/slang/library/slang_core_gc.h | 1597 ++++++++++----------
.../slang/library/slang_fragment_builtin_gc.h | 190 ++--
src/mesa/shader/slang/library/slang_pp_version.syn | 11 +-
.../shader/slang/library/slang_pp_version_syn.h | 10 +-
src/mesa/shader/slang/library/slang_shader.syn | 29 +-
src/mesa/shader/slang/library/slang_shader_syn.h | 26 +-
.../shader/slang/library/slang_vertex_builtin_gc.h | 175 ++--
src/mesa/shader/slang/slang_codegen.c | 484 +++++--
src/mesa/shader/slang/slang_codegen.h | 2 +-
src/mesa/shader/slang/slang_compile.c | 92 +-
src/mesa/shader/slang/slang_compile.h | 4 +-
src/mesa/shader/slang/slang_compile_function.c | 2 +-
src/mesa/shader/slang/slang_compile_operation.c | 2 +-
src/mesa/shader/slang/slang_compile_struct.c | 5 +-
src/mesa/shader/slang/slang_compile_variable.c | 2 +-
src/mesa/shader/slang/slang_compile_variable.h | 10 +
src/mesa/shader/slang/slang_emit.c | 239 ++--
src/mesa/shader/slang/slang_emit.h | 4 +-
src/mesa/shader/slang/slang_ir.c | 13 +-
src/mesa/shader/slang/slang_ir.h | 12 +-
src/mesa/shader/slang/slang_library_noise.c | 2 +-
src/mesa/shader/slang/slang_link.c | 100 +-
src/mesa/shader/slang/slang_log.c | 2 +-
src/mesa/shader/slang/slang_mem.c | 4 +-
src/mesa/shader/slang/slang_mem.h | 2 +-
src/mesa/shader/slang/slang_preprocess.c | 6 +-
src/mesa/shader/slang/slang_print.c | 2 +-
src/mesa/shader/slang/slang_simplify.c | 62 +-
src/mesa/shader/slang/slang_storage.c | 2 +-
src/mesa/shader/slang/slang_typeinfo.c | 32 +-
src/mesa/shader/slang/slang_typeinfo.h | 7 +-
src/mesa/shader/slang/slang_utility.c | 2 +-
src/mesa/shader/slang/slang_vartable.c | 40 +-
80 files changed, 4595 insertions(+), 3604 deletions(-)
create mode 100644 progs/glsl/CH06-brick.frag
delete mode 100644 progs/glsl/CH06-brick.frag.txt
create mode 100644 progs/glsl/CH06-brick.vert
delete mode 100644 progs/glsl/CH06-brick.vert.txt
create mode 100644 progs/glsl/CH11-bumpmap.frag
delete mode 100644 progs/glsl/CH11-bumpmap.frag.txt
create mode 100644 progs/glsl/CH11-bumpmap.vert
delete mode 100644 progs/glsl/CH11-bumpmap.vert.txt
create mode 100644 progs/glsl/CH11-toyball.frag
delete mode 100644 progs/glsl/CH11-toyball.frag.txt
create mode 100644 progs/glsl/CH11-toyball.vert
delete mode 100644 progs/glsl/CH11-toyball.vert.txt
create mode 100644 progs/glsl/CH18-mandel.frag
delete mode 100644 progs/glsl/CH18-mandel.frag.txt
create mode 100644 progs/glsl/CH18-mandel.vert
delete mode 100644 progs/glsl/CH18-mandel.vert.txt
create mode 100644 progs/glsl/convolution.frag
create mode 100644 progs/glsl/convolution.vert
create mode 100644 progs/glsl/convolutions.c
create mode 100644 progs/glsl/cubemap.frag
delete mode 100644 progs/glsl/cubemap.frag.txt
create mode 100644 progs/glsl/multitex.frag
delete mode 100644 progs/glsl/multitex.frag.txt
create mode 100644 progs/glsl/multitex.vert
delete mode 100644 progs/glsl/multitex.vert.txt
create mode 100644 progs/glsl/reflect.vert
delete mode 100644 progs/glsl/reflect.vert.txt
create mode 100644 progs/glsl/shadowtex.frag
delete mode 100644 progs/glsl/shadowtex.frag.txt
create mode 100644 progs/glsl/simple.vert
delete mode 100644 progs/glsl/simple.vert.txt
mode change 100755 => 100644
src/mesa/shader/slang/library/slang_pp_directives.syn
mode change 100755 => 100644
src/mesa/shader/slang/library/slang_pp_expression.syn
mode change 100755 => 100644 src/mesa/shader/slang/library/slang_version.syn
mode change 100755 => 100644 src/mesa/shader/slang/library/slang_version_syn.h
via 5d762e16139a9ec5bb33788d9d7f0f0853bf1091 (commit)
via 35479fd4b47b5488bab2b6230909e8716b858d49 (commit)
via 7970b2a908822ad009d29312e69be9eb2b7a5dd2 (commit)
via c0dd9122fdedd4bcab5bc0b3bbb490e6b62fac83 (commit)
via ce00d232f3c01c71fb659568e9b58da1f24b2519 (commit)
via db1103ebe8a4c683805694528e0a9c7a97c5769d (commit)
via 1f4997c2aaf424c8a12cc6fdb1dd994f66074a1d (commit)
from 1b39b92e6d7d3a7e6c39b985ffff32a79a510333 (commit)
- Commits -----------------------------------------------
commit 5d762e16139a9ec5bb33788d9d7f0f0853bf1091
Author: Brian Paul <[EMAIL PROTECTED]>
Date: Sat Aug 16 10:09:38 2008 -0600
added glu.exports files to tarballs list
commit 35479fd4b47b5488bab2b6230909e8716b858d49
Author: Brian Paul <[EMAIL PROTECTED]>
Date: Sat Aug 16 09:54:07 2008 -0600
fix convolutions test to consistanty use the ARB shader extension functions
Was using a mix of the ARB functions and the OpenGL 2.0 shader functions.
commit 7970b2a908822ad009d29312e69be9eb2b7a5dd2
Author: Brian Paul <[EMAIL PROTECTED]>
Date: Sat Aug 16 09:39:10 2008 -0600
prep for 7.1 rc4
commit c0dd9122fdedd4bcab5bc0b3bbb490e6b62fac83
Author: Brian Paul <[EMAIL PROTECTED]>
Date: Sat Aug 16 09:36:46 2008 -0600
remove .txt suffix from shader source files
commit ce00d232f3c01c71fb659568e9b58da1f24b2519
Author: Brian Paul <[EMAIL PROTECTED]>
Date: Sat Aug 16 09:34:12 2008 -0600
mesa: added glsl/convolutions test from gallium branch
commit db1103ebe8a4c683805694528e0a9c7a97c5769d
Author: Brian Paul <[EMAIL PROTECTED]>
Date: Sat Aug 16 09:31:27 2008 -0600
mesa: turn off 'x' bit misset on a few .h and .syn files
commit 1f4997c2aaf424c8a12cc6fdb1dd994f66074a1d
Author: Brian Paul <[EMAIL PROTECTED]>
Date: Sat Aug 16 09:30:14 2008 -0600
mesa: import latest GLSL code from gallium-0.1 branch
---------------------------------
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
