Add glsl_type::get_instance method

Gets the singleton corresponding to a particular scalar, vector, or
matrix type.

diff --git a/glsl_types.cpp b/glsl_types.cpp
index 2b06a3355380300e4d1581a17617120ffb22c7a9..6dcbba8e8cd3f0124b2bc73e35a45873ecdb7282 100644 (file)
--- a/glsl_types.cpp
+++ b/glsl_types.cpp
@@ -159,3 +159,59 @@ const glsl_type *glsl_type::get_base_type() const
       return glsl_error_type;
    }
 }
+
+
+const glsl_type *
+glsl_type::get_instance(unsigned base_type, unsigned rows, unsigned columns)
+{
+   if ((rows < 1) || (rows > 4) || (columns < 1) || (columns > 4))
+      return glsl_error_type;
+
+
+   /* Treat GLSL vectors as Nx1 matrices.
+    */
+   if (columns == 1) {
+      switch (base_type) {
+      case GLSL_TYPE_UINT:
+        return glsl_uint_type + (rows - 1);
+      case GLSL_TYPE_INT:
+        return glsl_int_type + (rows - 1);
+      case GLSL_TYPE_FLOAT:
+        return glsl_float_type + (rows - 1);
+      case GLSL_TYPE_BOOL:
+        return glsl_bool_type + (rows - 1);
+      default:
+        return glsl_error_type;
+      }
+   } else {
+      if ((base_type != GLSL_TYPE_FLOAT) || (rows == 1))
+        return glsl_error_type;
+
+      /* GLSL matrix types are named mat{COLUMNS}x{ROWS}.  Only the following
+       * combinations are valid:
+       *
+       *   1 2 3 4
+       * 1
+       * 2   x x x
+       * 3   x x x
+       * 4   x x x
+       */
+#define IDX(c,r) (((c-1)*3) + (r-1))
+
+      switch (IDX(columns, rows)) {
+      case IDX(2,2): return mat2_type;
+      case IDX(2,3): return mat2x3_type;
+      case IDX(2,4): return mat2x4_type;
+      case IDX(3,2): return mat3x2_type;
+      case IDX(3,3): return mat3_type;
+      case IDX(3,4): return mat3x4_type;
+      case IDX(4,2): return mat4x2_type;
+      case IDX(4,3): return mat4x3_type;
+      case IDX(4,4): return mat4_type;
+      default: return glsl_error_type;
+      }
+   }
+
+   assert(!"Should not get here.");
+   return glsl_error_type;
+}

diff --git a/glsl_types.h b/glsl_types.h
index 4a92712b211dfa4495187d5de7203c1ebfd33d21..a7897719fb4d168e79fcf1007888ddb804125a79 100644 (file)
--- a/glsl_types.h
+++ b/glsl_types.h
@@ -147,6 +147,12 @@ struct glsl_type {
     */
    const glsl_type *get_base_type() const;
 
+   /**
+    * Get the instance of a built-in scalar, vector, or matrix type
+    */
+   static const glsl_type *get_instance(unsigned base_type, unsigned rows,
+                                       unsigned columns);
+
    /**
     * Query whether or not a type is a scalar (non-vector and non-matrix).
     */