commit 08c331d42f31f8291238695d86db53d760e0b330
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Nov 28 19:38:39 2012 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Nov 28 19:38:39 2012 +0000
tree 71eb1a01a8a8999fd471275725d24d7d621ff0c3
parent c820c1238ef0cd9ad9591dc10a5fb1f3d6e75a73

Moved the stencilRef and stencilBackRef back to Context's state structure.

TRAC #22044

stencilRef and stencilBackRef are now set through the setDepthStencilState on
Renderer.

Signed-off-by: Nicolas Capens
Signed-off-by: Daniel Koch

Author:    Geoff Lang

git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1438 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/renderer/Renderer9.cpp

diff --git a/src/libGLESv2/renderer/Renderer9.cpp b/src/libGLESv2/renderer/Renderer9.cpp
index fa4724d..2dd6116 100644
--- a/src/libGLESv2/renderer/Renderer9.cpp
+++ b/src/libGLESv2/renderer/Renderer9.cpp
@@ -745,11 +745,13 @@
     mForceSetBlendState = false;
 }
 
-void Renderer9::setDepthStencilState(const gl::DepthStencilState &depthStencilState, bool frontFaceCCW,
-                                     unsigned int stencilSize)
+void Renderer9::setDepthStencilState(const gl::DepthStencilState &depthStencilState, int stencilRef,
+                                     int stencilBackRef, bool frontFaceCCW, unsigned int stencilSize)
 {
     bool depthStencilStateChanged = mForceSetDepthStencilState ||
                                     memcmp(&depthStencilState, &mCurDepthStencilState, sizeof(gl::DepthStencilState)) != 0;
+    bool stencilRefChanged = mForceSetDepthStencilState || stencilRef != mCurStencilRef ||
+                             stencilBackRef != mCurStencilBackRef;
     bool frontFaceCCWChanged = mForceSetDepthStencilState || frontFaceCCW != mCurFrontFaceCCW;
     bool stencilSizeChanged = mForceSetDepthStencilState || stencilSize != mCurStencilSize;
 
@@ -768,7 +770,7 @@
         mCurDepthStencilState = depthStencilState;
     }
 
-    if (depthStencilStateChanged || frontFaceCCWChanged || stencilSizeChanged)
+    if (depthStencilStateChanged || stencilRefChanged || frontFaceCCWChanged || stencilSizeChanged)
     {
         if (depthStencilState.stencilTest && stencilSize > 0)
         {
@@ -780,7 +782,7 @@
             const D3DRENDERSTATETYPE D3DRS_CCW_STENCILMASK = D3DRS_STENCILMASK;
             const D3DRENDERSTATETYPE D3DRS_CCW_STENCILWRITEMASK = D3DRS_STENCILWRITEMASK;
             if (depthStencilState.stencilWritemask != depthStencilState.stencilBackWritemask ||
-                depthStencilState.stencilRef != depthStencilState.stencilBackRef ||
+                stencilRef != stencilBackRef ||
                 depthStencilState.stencilMask != depthStencilState.stencilBackMask)
             {
                 ERR("Separate front/back stencil writemasks, reference values, or stencil mask values are invalid under WebGL.");
@@ -796,7 +798,7 @@
                                     gl_d3d9::ConvertComparison(depthStencilState.stencilFunc));
 
             mDevice->SetRenderState(frontFaceCCW ? D3DRS_STENCILREF : D3DRS_CCW_STENCILREF,
-                                    (depthStencilState.stencilRef < (GLint)maxStencil) ? depthStencilState.stencilRef : maxStencil);
+                                    (stencilRef < (int)maxStencil) ? stencilRef : maxStencil);
             mDevice->SetRenderState(frontFaceCCW ? D3DRS_STENCILMASK : D3DRS_CCW_STENCILMASK,
                                     depthStencilState.stencilMask);
 
@@ -813,7 +815,7 @@
                                     gl_d3d9::ConvertComparison(depthStencilState.stencilBackFunc));
 
             mDevice->SetRenderState(!frontFaceCCW ? D3DRS_STENCILREF : D3DRS_CCW_STENCILREF,
-                                    (depthStencilState.stencilBackRef < (GLint)maxStencil) ? depthStencilState.stencilBackRef : maxStencil);
+                                    (stencilBackRef < (int)maxStencil) ? stencilBackRef : maxStencil);
             mDevice->SetRenderState(!frontFaceCCW ? D3DRS_STENCILMASK : D3DRS_CCW_STENCILMASK,
                                     depthStencilState.stencilBackMask);
 
@@ -831,6 +833,8 @@
 
         mDevice->SetRenderState(D3DRS_ZWRITEENABLE, depthStencilState.depthMask ? TRUE : FALSE);
 
+        mCurStencilRef = stencilRef;
+        mCurStencilBackRef = stencilBackRef;
         mCurFrontFaceCCW = frontFaceCCW;
         mCurStencilSize = stencilSize;
     }