Fixed issues with state force flag initialization and applyRenderTarget placement.

TRAC #22041 Fixed the state force flags being incorrectly initialized in Renderer9's destructor, they are now in the constructor. Renderer::applyRenderTarget is now correctly called fromt he begining of Context::applyRenderTarget instead of the end. Signed-off-by: Daniel Koch Author: Geoff Lang git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1425 736b8ea6-26fd-11df-bfd4-992fa37f6226

Fixed issues with state force flag initialization and applyRenderTarget placement.
8a8b24c7 · daniel@transgaming.com · 2e258644 · 8a8b24c7 · 8a8b24c7
Commit 8a8b24c7 authored Nov 28, 2012 by daniel@transgaming.com
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 7 deletions

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

Renderer9.cpp src/libGLESv2/renderer/Renderer9.cpp +5 -5

No files found.
--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
@@ -1751,6 +1751,8 @@ bool Context::applyRenderTarget(bool ignoreViewport)
        return error(GL_INVALID_FRAMEBUFFER_OPERATION, false);
    }

+    mRenderer->applyRenderTarget(framebufferObject);
+
    // if there is no color attachment we must synthesize a NULL colorattachment
    // to keep the D3D runtime happy.  This should only be possible if depth texturing.
    Renderbuffer *renderbufferObject = NULL;
@@ -1904,8 +1906,6 @@ bool Context::applyRenderTarget(bool ignoreViewport)
        mDxUniformsDirty = false;
    }

-    mRenderer->applyRenderTarget(framebufferObject);
-
    return true;
 }


--- a/src/libGLESv2/renderer/Renderer9.cpp
+++ b/src/libGLESv2/renderer/Renderer9.cpp
@@ -79,6 +79,11 @@ Renderer9::Renderer9(egl::Display *display, HDC hDc, bool softwareDevice) : Rend
    mDeviceLost = false;

    mMaxSupportedSamples = 0;
+
+    mForceSetDepthStencilState = true;
+    mForceSetRasterState = true;
+    mForceSetBlendState = true;
+    mForceSetScissor = true;
 }

 Renderer9::~Renderer9()
@@ -133,11 +138,6 @@ Renderer9::~Renderer9()
        delete [] mMultiSampleSupport.begin()->second;
        mMultiSampleSupport.erase(mMultiSampleSupport.begin());
    }
-
-    mForceSetDepthStencilState = true;
-    mForceSetRasterState = true;
-    mForceSetBlendState = true;
-    mForceSetScissor = true;
 }

 EGLint Renderer9::initialize()