Mesa (master): glsl: Add sampler2DMS/sampler2DMSArray types to GLSL 1.50.

[Kenneth Graunke]

Module: Mesa
Branch: master
Commit: bcdda04349e1f2b32fb2eca32c6589858c1e38e6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bcdda04349e1f2b32fb2eca32c6589858c1e38e6

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Mon Mar 18 18:57:27 2013 -0700

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 <kenneth at whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Chris Forbes <chrisf at ijw.co.nz>

---

 src/glsl/glsl_types.cpp |   12 +++++++++++-
 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 a783dcc..8b0a248 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 7930426..2f3b19f 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);