D3D11: Fix nullptr dereference from bad merge.

f1ca5288 was a cherry-pick that was merged incorrectly after some conflicts. This was causing a very serious crasher in Chrome. BUG=chromium:730126 BUG=chromium:735986 Change-Id: I82a48c25d604e1088800cb870297ccfef5915fc5 Reviewed-on: https://chromium-review.googlesource.com/544541Reviewed-by: Jamie Madill <jmadill@chromium.org>

D3D11: Fix nullptr dereference from bad merge.
3e6a61fe · Jamie Madill · f1ca5288 · 3e6a61fe
Commit 3e6a61fe authored Jun 22, 2017 by Jamie Madill
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Clear11.cpp src/libANGLE/renderer/d3d/d3d11/Clear11.cpp +2 -2

No files found.
--- a/src/libANGLE/renderer/d3d/d3d11/Clear11.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/Clear11.cpp
@@ -370,8 +370,8 @@ gl::Error Clear11::clearFramebuffer(const ClearParameters &clearParams,
    {
        const gl::FramebufferAttachment &attachment = colorAttachments[colorAttachmentIndex];
-        if (clearParams.clearColor[colorAttachmentIndex] && attachment.isAttached() &&
+        if (!clearParams.clearColor[colorAttachmentIndex] || !attachment.isAttached() ||
-            drawBufferStates[colorAttachmentIndex] != GL_NONE)
+            drawBufferStates[colorAttachmentIndex] == GL_NONE)
        {
            continue;
        }