i965/fs: Implement texelFetch() on Ironlake and Sandybridge.

[mesa.git] / src / mesa / program / prog_uniform.h

diff --git a/src/mesa/program/prog_uniform.h b/src/mesa/program/prog_uniform.h
index 22a2bfd9701173cf99a5a10bed0c3fa146f052d3..67f78006eac31a762c529c1d46b9e656af291a97 100644 (file)
--- a/src/mesa/program/prog_uniform.h
+++ b/src/mesa/program/prog_uniform.h
@@ -31,8 +31,7 @@
 #ifndef PROG_UNIFORM_H
 #define PROG_UNIFORM_H
 
-#include "main/mtypes.h"
-#include "prog_statevars.h"
+#include "main/glheader.h"
 
 
 /**
@@ -50,11 +49,9 @@ struct gl_uniform
    const char *Name;        /**< Null-terminated string */
    GLint VertPos;
    GLint FragPos;
+   GLint GeomPos;
    GLboolean Initialized;   /**< For debug.  Has this uniform been set? */
-#if 0
-   GLenum DataType;         /**< GL_FLOAT, GL_FLOAT_VEC2, etc */
-   GLuint Size;             /**< Number of components (1..4) */
-#endif
+   const struct glsl_type *Type;
 };