From bcdda04349e1f2b32fb2eca32c6589858c1e38e6 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Mon, 18 Mar 2013 18:57:27 -0700 Subject: [PATCH] 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 Reviewed-by: Jordan Justen Reviewed-by: Chris Forbes --- src/glsl/glsl_types.cpp | 12 +++++++++++- src/glsl/glsl_types.h | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) 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); -- 2.11.0