summaryrefslogtreecommitdiff
path: root/src/mesa/program/prog_uniform.h
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-08-24 14:27:27 -0700
committerEric Anholt <eric@anholt.net>2010-08-25 12:38:26 -0700
commit0924ba0c3496160a134d37cec800f902ae805b9c (patch)
tree31dd640618e6aac096ed9c1ae5f18fda23297415 /src/mesa/program/prog_uniform.h
parent45388b5467d66a887e9c76b66ae126ec07d4125a (diff)
ir_to_mesa: Convert this code to using linker.cpp's uniform locations.
Fixes: glsl-fs-uniform-array-4.
Diffstat (limited to 'src/mesa/program/prog_uniform.h')
-rw-r--r--src/mesa/program/prog_uniform.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/mesa/program/prog_uniform.h b/src/mesa/program/prog_uniform.h
index 7988d534a7..67f78006ea 100644
--- a/src/mesa/program/prog_uniform.h
+++ b/src/mesa/program/prog_uniform.h
@@ -51,10 +51,7 @@ struct gl_uniform
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;
};