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
parent 12e02218
...@@ -828,6 +828,9 @@ void Renderer11::clear(const gl::ClearParameters &clearParams, gl::Framebuffer * ...@@ -828,6 +828,9 @@ void Renderer11::clear(const gl::ClearParameters &clearParams, gl::Framebuffer *
void Renderer11::markAllStateDirty() void Renderer11::markAllStateDirty()
{ {
mAppliedRenderTargetSerial = 0;
mAppliedDepthbufferSerial = 0;
mAppliedStencilbufferSerial = 0;
mDepthStencilInitialized = false; mDepthStencilInitialized = false;
mRenderTargetDescInitialized = false; mRenderTargetDescInitialized = false;
......
...@@ -88,8 +88,6 @@ Renderer9::Renderer9(egl::Display *display, HDC hDc, bool softwareDevice) : Rend ...@@ -88,8 +88,6 @@ Renderer9::Renderer9(egl::Display *display, HDC hDc, bool softwareDevice) : Rend
mMaxSupportedSamples = 0; mMaxSupportedSamples = 0;
mAppliedIBSerial = 0;
mMaskedClearSavedState = NULL; mMaskedClearSavedState = NULL;
mVertexDataManager = NULL; mVertexDataManager = NULL;
...@@ -1622,9 +1620,11 @@ void Renderer9::markAllStateDirty() ...@@ -1622,9 +1620,11 @@ void Renderer9::markAllStateDirty()
mForceSetDepthStencilState = true; mForceSetDepthStencilState = true;
mForceSetRasterState = true; mForceSetRasterState = true;
mForceSetBlendState = true;
mForceSetScissor = true; mForceSetScissor = true;
mForceSetViewport = true; mForceSetViewport = true;
mForceSetBlendState = true;
mAppliedIBSerial = 0;
mVertexDeclarationCache.markStateDirty(); mVertexDeclarationCache.markStateDirty();
} }
......
...@@ -247,8 +247,6 @@ class Renderer9 : public Renderer ...@@ -247,8 +247,6 @@ class Renderer9 : public Renderer
bool mForceSetScissor; bool mForceSetScissor;
gl::Rectangle mCurScissor; gl::Rectangle mCurScissor;
bool mScissorEnabled; bool mScissorEnabled;
unsigned int mCurRenderTargetWidth;
unsigned int mCurRenderTargetHeight;
bool mForceSetViewport; bool mForceSetViewport;
gl::Rectangle mCurViewport; gl::Rectangle mCurViewport;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment