diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2008-11-15 16:53:24 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2008-11-15 16:53:24 +0000 |
| commit | 7468765b18be202a64d58b83f6267b6973ea4897 (patch) | |
| tree | 6e9fa6dd4a2ff79787bcae247377d07c00a036cf /src/mesa/shader/slang/library/slang_common_builtin.gc | |
| parent | 5e1454a036be6da2c48e2e20bf6f8047ee1a94d3 (diff) | |
| parent | 80d6379722a1249ce13db79a898d340644936f67 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
src/mesa/shader/prog_print.c
Diffstat (limited to 'src/mesa/shader/slang/library/slang_common_builtin.gc')
| -rw-r--r-- | src/mesa/shader/slang/library/slang_common_builtin.gc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mesa/shader/slang/library/slang_common_builtin.gc b/src/mesa/shader/slang/library/slang_common_builtin.gc index 561e94f6ba..a051c53eea 100644 --- a/src/mesa/shader/slang/library/slang_common_builtin.gc +++ b/src/mesa/shader/slang/library/slang_common_builtin.gc @@ -47,7 +47,6 @@ uniform mat4 gl_ModelViewProjectionMatrix; uniform mat4 gl_TextureMatrix[gl_MaxTextureCoords]; uniform mat3 gl_NormalMatrix; -uniform mat3 __NormalMatrixTranspose; // Mesa only uniform mat4 gl_ModelViewMatrixInverse; uniform mat4 gl_ProjectionMatrixInverse; |