diff options
| author | Brian <brian@nostromo.localnet.net> | 2007-04-08 16:47:32 -0600 |
|---|---|---|
| committer | Brian <brian@nostromo.localnet.net> | 2007-04-08 16:47:32 -0600 |
| commit | 5c0c60a13cb95032a49aa77ae7275387a351a057 (patch) | |
| tree | 456aa4eba1683dfc06835c80212a928d2d0af656 /src/mesa/shader/slang/library | |
| parent | 5dba996dba3bd55f1f44904e7abd9486fee899d9 (diff) | |
support for GLSL 1.20 non-square matrices
Diffstat (limited to 'src/mesa/shader/slang/library')
| -rw-r--r-- | src/mesa/shader/slang/library/slang_shader.syn | 21 | ||||
| -rw-r--r-- | src/mesa/shader/slang/library/slang_shader_syn.h | 12 |
2 files changed, 33 insertions, 0 deletions
diff --git a/src/mesa/shader/slang/library/slang_shader.syn b/src/mesa/shader/slang/library/slang_shader.syn index 9389869da2..1764d1ae68 100644 --- a/src/mesa/shader/slang/library/slang_shader.syn +++ b/src/mesa/shader/slang/library/slang_shader.syn @@ -144,6 +144,15 @@ .emtcode TYPE_SPECIFIER_STRUCT 24 .emtcode TYPE_SPECIFIER_TYPENAME 25 +/* OpenGL 2.1 */ +.emtcode TYPE_SPECIFIER_MAT23 26 +.emtcode TYPE_SPECIFIER_MAT32 27 +.emtcode TYPE_SPECIFIER_MAT24 28 +.emtcode TYPE_SPECIFIER_MAT42 29 +.emtcode TYPE_SPECIFIER_MAT34 30 +.emtcode TYPE_SPECIFIER_MAT43 31 + + /* structure field */ .emtcode FIELD_NONE 0 .emtcode FIELD_NEXT 1 @@ -880,6 +889,12 @@ type_qualifier | "mat2" | "mat3" | "mat4" + | "mat2x3" + | "mat3x2" + | "mat2x4" + | "mat4x2" + | "mat3x4" + | "mat4x3" | "sampler1D" | "sampler2D" | "sampler3D" @@ -908,6 +923,12 @@ type_specifier_space "mat2" .emit TYPE_SPECIFIER_MAT2 .or "mat3" .emit TYPE_SPECIFIER_MAT3 .or "mat4" .emit TYPE_SPECIFIER_MAT4 .or + "mat2x3" .emit TYPE_SPECIFIER_MAT23 .or + "mat3x2" .emit TYPE_SPECIFIER_MAT32 .or + "mat2x4" .emit TYPE_SPECIFIER_MAT24 .or + "mat4x2" .emit TYPE_SPECIFIER_MAT42 .or + "mat3x4" .emit TYPE_SPECIFIER_MAT34 .or + "mat4x3" .emit TYPE_SPECIFIER_MAT43 .or "sampler1D" .emit TYPE_SPECIFIER_SAMPLER1D .or "sampler2D" .emit TYPE_SPECIFIER_SAMPLER2D .or "sampler3D" .emit TYPE_SPECIFIER_SAMPLER3D .or diff --git a/src/mesa/shader/slang/library/slang_shader_syn.h b/src/mesa/shader/slang/library/slang_shader_syn.h index 4863feda5b..fe37adcac4 100644 --- a/src/mesa/shader/slang/library/slang_shader_syn.h +++ b/src/mesa/shader/slang/library/slang_shader_syn.h @@ -67,6 +67,12 @@ ".emtcode TYPE_SPECIFIER_SAMPLER2DRECTSHADOW 23\n" ".emtcode TYPE_SPECIFIER_STRUCT 24\n" ".emtcode TYPE_SPECIFIER_TYPENAME 25\n" +".emtcode TYPE_SPECIFIER_MAT23 26\n" +".emtcode TYPE_SPECIFIER_MAT32 27\n" +".emtcode TYPE_SPECIFIER_MAT24 28\n" +".emtcode TYPE_SPECIFIER_MAT42 29\n" +".emtcode TYPE_SPECIFIER_MAT34 30\n" +".emtcode TYPE_SPECIFIER_MAT43 31\n" ".emtcode FIELD_NONE 0\n" ".emtcode FIELD_NEXT 1\n" ".emtcode FIELD_ARRAY 2\n" @@ -431,6 +437,12 @@ " \"mat2\" .emit TYPE_SPECIFIER_MAT2 .or\n" " \"mat3\" .emit TYPE_SPECIFIER_MAT3 .or\n" " \"mat4\" .emit TYPE_SPECIFIER_MAT4 .or\n" +" \"mat2x3\" .emit TYPE_SPECIFIER_MAT23 .or\n" +" \"mat3x2\" .emit TYPE_SPECIFIER_MAT32 .or\n" +" \"mat2x4\" .emit TYPE_SPECIFIER_MAT24 .or\n" +" \"mat4x2\" .emit TYPE_SPECIFIER_MAT42 .or\n" +" \"mat3x4\" .emit TYPE_SPECIFIER_MAT34 .or\n" +" \"mat4x3\" .emit TYPE_SPECIFIER_MAT43 .or\n" " \"sampler1D\" .emit TYPE_SPECIFIER_SAMPLER1D .or\n" " \"sampler2D\" .emit TYPE_SPECIFIER_SAMPLER2D .or\n" " \"sampler3D\" .emit TYPE_SPECIFIER_SAMPLER3D .or\n" |