glsl: use better location in struct and block error messages

[mesa.git] / src / glsl / ir_uniform.h

diff --git a/src/glsl/ir_uniform.h b/src/glsl/ir_uniform.h
index 21b5d05c11a03c5d7882552fbda462bb4c6b5415..1854279925bf4ff8aea55a6ad6bcba3a643fc96a 100644 (file)
--- a/src/glsl/ir_uniform.h
+++ b/src/glsl/ir_uniform.h
@@ -110,9 +110,7 @@ struct gl_uniform_storage {
     */
    bool initialized;
 
-   struct gl_opaque_uniform_index sampler[MESA_SHADER_STAGES];
-
-   struct gl_opaque_uniform_index image[MESA_SHADER_STAGES];
+   struct gl_opaque_uniform_index opaque[MESA_SHADER_STAGES];
 
    /**
     * Storage used by the driver for the uniform
@@ -163,6 +161,22 @@ struct gl_uniform_storage {
 
    /** @} */
 
+   /**
+    * This is a compiler-generated uniform that should not be advertised
+    * via the API.
+    */
+   bool hidden;
+
+   /**
+    * This is a built-in uniform that should not be modified through any gl API.
+    */
+   bool builtin;
+
+   /**
+    * This is a shader storage buffer variable, not an uniform.
+    */
+   bool is_shader_storage;
+
    /**
     * Index within gl_shader_program::AtomicBuffers[] of the atomic
     * counter buffer this uniform is stored in, or -1 if this is not
@@ -173,14 +187,26 @@ struct gl_uniform_storage {
    /**
     * The 'base location' for this uniform in the uniform remap table. For
     * arrays this is the first element in the array.
+    * for subroutines this is in shader subroutine uniform remap table.
     */
    unsigned remap_location;
 
    /**
-    * This is a compiler-generated uniform that should not be advertised
-    * via the API.
+    * The number of compatible subroutines with this subroutine uniform.
     */
-   bool hidden;
+   unsigned num_compatible_subroutines;
+
+   /**
+    * A single integer identifying the number of active array elements of
+    * the top-level shader storage block member (GL_TOP_LEVEL_ARRAY_SIZE).
+    */
+   unsigned top_level_array_size;
+
+   /**
+    * A single integer identifying the stride between array elements of the
+    * top-level shader storage block member. (GL_TOP_LEVEL_ARRAY_STRIDE).
+    */
+   unsigned top_level_array_stride;
 };
 
 #ifdef __cplusplus