Compiler - active uniforms and attributes
TRAC #11590
Preparation refactoring that removes UniformType since there are already GL enums for uniform types.
Signed-off-by: Andrew Lewycky
Signed-off-by: Daniel Koch
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/trunk@78 736b8ea6-26fd-11df-bfd4-992fa37f6226
diff --git a/src/libGLESv2/Program.h b/src/libGLESv2/Program.h
index 0ce0add..92257eb 100644
--- a/src/libGLESv2/Program.h
+++ b/src/libGLESv2/Program.h
@@ -21,26 +21,14 @@
class FragmentShader;
class VertexShader;
-enum UniformType
-{
- UNIFORM_1FV,
- UNIFORM_2FV,
- UNIFORM_3FV,
- UNIFORM_4FV,
- UNIFORM_MATRIX_2FV,
- UNIFORM_MATRIX_3FV,
- UNIFORM_MATRIX_4FV,
- UNIFORM_1IV
-};
-
// Helper struct representing a single shader uniform
struct Uniform
{
- Uniform(UniformType type, const std::string &name, unsigned int bytes);
+ Uniform(GLenum type, const std::string &name, unsigned int bytes);
~Uniform();
- const UniformType type;
+ const GLenum type;
const std::string name;
const unsigned int bytes;
unsigned char *data;