diff options
| author | Kenneth Graunke <[email protected]> | 2013-03-18 18:57:27 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2013-03-20 10:38:38 -0700 |
| commit | bcdda04349e1f2b32fb2eca32c6589858c1e38e6 (patch) | |
| tree | 9a6f843f3979b00fe3ebdb8d1e9d5a95de0578be /src | |
| parent | f1ca2ed5387a6252a09b88324c1c239f16025ee2 (diff) | |
glsl: Add sampler2DMS/sampler2DMSArray types to GLSL 1.50.
GLSL 1.50 includes support for the new sampler types introduced by
the ARB_texture_multisample extension.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Jordan Justen <[email protected]>
Reviewed-by: Chris Forbes <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/glsl/glsl_types.cpp | 12 | ||||
| -rw-r--r-- | src/glsl/glsl_types.h | 1 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp index a783dcc3b9c..8b0a2480585 100644 --- a/src/glsl/glsl_types.cpp +++ b/src/glsl/glsl_types.cpp @@ -292,6 +292,14 @@ glsl_type::generate_140_types(glsl_symbol_table *symtab) void +glsl_type::generate_150_types(glsl_symbol_table *symtab) +{ + generate_140_types(symtab); + generate_ARB_texture_multisample_types(symtab, false); +} + + +void glsl_type::generate_ARB_texture_rectangle_types(glsl_symbol_table *symtab, bool warn) { @@ -385,9 +393,11 @@ _mesa_glsl_initialize_types(struct _mesa_glsl_parse_state *state) glsl_type::generate_130_types(state->symbols, true, skip_1d); break; case 140: - case 150: glsl_type::generate_140_types(state->symbols); break; + case 150: + glsl_type::generate_150_types(state->symbols); + break; default: assert(!"Unexpected language version"); break; diff --git a/src/glsl/glsl_types.h b/src/glsl/glsl_types.h index 79304269dfc..2f3b19f5107 100644 --- a/src/glsl/glsl_types.h +++ b/src/glsl/glsl_types.h @@ -583,6 +583,7 @@ private: static void generate_130_types(glsl_symbol_table *, bool add_deprecated, bool skip_1d); static void generate_140_types(glsl_symbol_table *); + static void generate_150_types(glsl_symbol_table *); static void generate_ARB_texture_rectangle_types(glsl_symbol_table *, bool); static void generate_EXT_texture_array_types(glsl_symbol_table *, bool); static void generate_OES_texture_3D_types(glsl_symbol_table *, bool); |