commit 9a067375601a2fb6f3d1cb66c49187fab7466a3e
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Dec 20 20:55:24 2012 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Dec 20 20:55:24 2012 +0000
tree ac24780b39c3ea7023025a39ba850811f84ef7de
parent 12e02218fe8a0a8ff962463a4f185d276421195b

Ensure state caching variables are handled consistently in markAllStateDirty

Trac #22249
Signed-off-by: Geoff Lang
Signed-off-by: Shannon Woods

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

src/libGLESv2/renderer/Renderer11.cpp

diff --git a/src/libGLESv2/renderer/Renderer11.cpp b/src/libGLESv2/renderer/Renderer11.cpp
index 4604a15..33560c6 100644
--- a/src/libGLESv2/renderer/Renderer11.cpp
+++ b/src/libGLESv2/renderer/Renderer11.cpp
@@ -828,6 +828,9 @@
 
 void Renderer11::markAllStateDirty()
 {
+    mAppliedRenderTargetSerial = 0;
+    mAppliedDepthbufferSerial = 0;
+    mAppliedStencilbufferSerial = 0;
     mDepthStencilInitialized = false;
     mRenderTargetDescInitialized = false;
 

src/libGLESv2/renderer/Renderer9.cpp

diff --git a/src/libGLESv2/renderer/Renderer9.cpp b/src/libGLESv2/renderer/Renderer9.cpp
index 8b4ff69..c8a8c0d 100644
--- a/src/libGLESv2/renderer/Renderer9.cpp
+++ b/src/libGLESv2/renderer/Renderer9.cpp
@@ -88,8 +88,6 @@
 
     mMaxSupportedSamples = 0;
 
-    mAppliedIBSerial = 0;
-
     mMaskedClearSavedState = NULL;
 
     mVertexDataManager = NULL;
@@ -1622,9 +1620,11 @@
 
     mForceSetDepthStencilState = true;
     mForceSetRasterState = true;
-    mForceSetBlendState = true;
     mForceSetScissor = true;
     mForceSetViewport = true;
+    mForceSetBlendState = true;
+
+    mAppliedIBSerial = 0;
 
     mVertexDeclarationCache.markStateDirty();
 }

src/libGLESv2/renderer/Renderer9.h

diff --git a/src/libGLESv2/renderer/Renderer9.h b/src/libGLESv2/renderer/Renderer9.h
index 72ca470..45a0914 100644
--- a/src/libGLESv2/renderer/Renderer9.h
+++ b/src/libGLESv2/renderer/Renderer9.h
@@ -247,8 +247,6 @@
     bool mForceSetScissor;
     gl::Rectangle mCurScissor;
     bool mScissorEnabled;
-    unsigned int mCurRenderTargetWidth;
-    unsigned int mCurRenderTargetHeight;
 
     bool mForceSetViewport;
     gl::Rectangle mCurViewport;