Context now uses the new structures storing state.

TRAC #22041 Context now uses the new structures for holding rasterizer, blend, depth stencil and scissor state andcalls the new set methods on the Renderer interface to set state. Signed-off-by: Shannon Woods Signed-off-by: Daniel Koch Author: Geoff Lang git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1422 736b8ea6-26fd-11df-bfd4-992fa37f6226

Context now uses the new structures storing state.
f39967e1 · daniel@transgaming.com · 493d4f87 · f39967e1 · f39967e1
Commit f39967e1 authored Nov 28, 2012 by daniel@transgaming.com
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 44 deletions

Context.cpp src/libGLESv2/Context.cpp +0 -0

Context.h src/libGLESv2/Context.h +6 -44

No files found.
--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
--- a/src/libGLESv2/Context.h
+++ b/src/libGLESv2/Context.h
@@ -154,43 +154,16 @@ struct State
    GLclampf depthClearValue;
    int stencilClearValue;

-    bool cullFace;
-    GLenum cullMode;
-    GLenum frontFace;
-    bool depthTest;
-    GLenum depthFunc;
-    bool blend;
-    GLenum sourceBlendRGB;
-    GLenum destBlendRGB;
-    GLenum sourceBlendAlpha;
-    GLenum destBlendAlpha;
-    GLenum blendEquationRGB;
-    GLenum blendEquationAlpha;
+    RasterizerState rasterizer;
+    Rectangle scissor;
+
+    BlendState blend;
    Color blendColor;
-    bool stencilTest;
-    GLenum stencilFunc;
-    GLint stencilRef;
-    GLuint stencilMask;
-    GLenum stencilFail;
-    GLenum stencilPassDepthFail;
-    GLenum stencilPassDepthPass;
-    GLuint stencilWritemask;
-    GLenum stencilBackFunc;
-    GLint stencilBackRef;
-    GLuint stencilBackMask;
-    GLenum stencilBackFail;
-    GLenum stencilBackPassDepthFail;
-    GLenum stencilBackPassDepthPass;
-    GLuint stencilBackWritemask;
-    bool polygonOffsetFill;
-    GLfloat polygonOffsetFactor;
-    GLfloat polygonOffsetUnits;
-    bool sampleAlphaToCoverage;
    bool sampleCoverage;
    GLclampf sampleCoverageValue;
    bool sampleCoverageInvert;
-    bool scissorTest;
-    bool dither;
+
+    DepthStencilState depthStencil;

    GLfloat lineWidth;

@@ -204,17 +177,6 @@ struct State
    float zNear;
    float zFar;

-    GLint scissorX;
-    GLint scissorY;
-    GLsizei scissorWidth;
-    GLsizei scissorHeight;
-
-    bool colorMaskRed;
-    bool colorMaskGreen;
-    bool colorMaskBlue;
-    bool colorMaskAlpha;
-    bool depthMask;
-
    unsigned int activeSampler;   // Active texture unit selector - GL_TEXTURE0
    BindingPointer<Buffer> arrayBuffer;
    BindingPointer<Buffer> elementArrayBuffer;