Add state for GL_COMBINE.

Bug 21278131 Change-Id: I0590b67be5fad5690739b8ebaa9245cba4187b40 Reviewed-on: https://swiftshader-review.googlesource.com/3231Reviewed-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com> Tested-by: Nicolas Capens <capn@google.com>

Add state for GL_COMBINE.
2be04209 · Nicolas Capens · 83f26ffe · 2be04209 · 2be04209
Commit 2be04209 authored May 22, 2015 by Nicolas Capens
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 20 additions and 2 deletions

Context.cpp src/OpenGL/libGLES_CM/Context.cpp +0 -0

Context.h src/OpenGL/libGLES_CM/Context.h +20 -2

No files found.
--- a/src/OpenGL/libGLES_CM/Context.cpp
+++ b/src/OpenGL/libGLES_CM/Context.cpp
--- a/src/OpenGL/libGLES_CM/Context.h
+++ b/src/OpenGL/libGLES_CM/Context.h
@@ -180,6 +180,25 @@ class VertexAttribute

 typedef VertexAttribute VertexAttributeArray[MAX_VERTEX_ATTRIBS];

+struct TextureUnit
+{
+	GLenum environmentMode;
+	GLenum combineRGB;
+	GLenum combineAlpha;
+	GLenum src0RGB;
+	GLenum src0Alpha;
+	GLenum src1RGB;
+	GLenum src1Alpha;
+	GLenum src2RGB;
+	GLenum src2Alpha;
+	GLenum operand0RGB;
+	GLenum operand0Alpha;
+	GLenum operand1RGB;
+	GLenum operand1Alpha;
+	GLenum operand2RGB;
+	GLenum operand2Alpha;
+};
+
 // Helper structure to store all raw state
 struct State
 {
@@ -253,7 +272,7 @@ struct State
    GLint unpackAlignment;
    GLint packAlignment;

-	GLenum textureEnvMode;
+	TextureUnit textureUnit[MAX_TEXTURE_UNITS];
 };

 class Context : public egl::Context
@@ -332,7 +351,6 @@ public:
 	unsigned int getActiveTexture() const;

 	void setTextureEnvMode(GLenum texEnvMode);
-	GLenum getTextureEnvMode();

    void setLineWidth(GLfloat width);