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
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;
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();
}
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;