radeon / r200: Pass the API into _mesa_initialize_context

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

diff --git a/src/glsl/ir_uniform.h b/src/glsl/ir_uniform.h
index 8198c4819833fd5edcd70470836a751b20071e58..f678c2c5c4d34f4bb073727ccbc6597ba73c81fb 100644 (file)
--- a/src/glsl/ir_uniform.h
+++ b/src/glsl/ir_uniform.h
@@ -116,7 +116,7 @@ struct gl_uniform_storage {
        * Whether this sampler is used in this shader stage.
        */
       bool active;
-   } sampler[MESA_SHADER_TYPES];
+   } sampler[MESA_SHADER_STAGES];
 
    /**
     * Storage used by the driver for the uniform
@@ -166,6 +166,13 @@ struct gl_uniform_storage {
    bool row_major;
 
    /** @} */
+
+   /**
+    * Index within gl_shader_program::AtomicBuffers[] of the atomic
+    * counter buffer this uniform is stored in, or -1 if this is not
+    * an atomic counter.
+    */
+   int atomic_buffer_index;
 };
 
 #ifdef __cplusplus