Sync the scissor tests state before clearing.

Fixes: * conformance/rendering/gl-scissor-fbo-test.html * conformance/rendering/gl-scissor-canvas-dimensions.html BUG=angleproject:883 Change-Id: Icd337894f1dbc7464a4566bfab9a30b70fd4bbfa Reviewed-on: https://chromium-review.googlesource.com/274445Reviewed-by: Jamie Madill <jmadill@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>

Sync the scissor tests state before clearing.
ae6584e6 · Geoff Lang · fbd7820c · ae6584e6
Commit ae6584e6 authored Jun 01, 2015 by Geoff Lang
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

StateManagerGL.cpp src/libANGLE/renderer/gl/StateManagerGL.cpp +6 -1

No files found.
--- a/src/libANGLE/renderer/gl/StateManagerGL.cpp
+++ b/src/libANGLE/renderer/gl/StateManagerGL.cpp
@@ -285,7 +285,12 @@ void StateManagerGL::setClearState(const gl::State &state, GLbitfield mask)
    setRasterizerDiscardEnabled(rasterizerState.rasterizerDiscard);
    if (!rasterizerState.rasterizerDiscard)
    {
-        setScissor(state.getScissor());
+        setScissorTestEnabled(state.isScissorTestEnabled());
+        if (state.isScissorTestEnabled())
+        {
+            setScissor(state.getScissor());
+        }
        setViewport(state.getViewport());
        if ((mask & GL_COLOR_BUFFER_BIT) != 0)