commit 60a396a813370c1e60a8e0fe6cc9cd16c54b2a6a
author Jonah Ryan-Davis <jonahr@google.com> Thu Nov 07 21:36:45 2019
committer Commit Bot <commit-bot@chromium.org> Fri Nov 08 21:05:03 2019
tree f25788ed9bc9d9f36cc32427ba4f4e5b4201f687
parent 50919254cbc716d09703f93c2d38a0368809dbda

Reset texture swizzle state to default after LUMA workaround

The copySubImage LUMA workaround sets special TEXTURE_SWIZZLE_RGBA
values to work. However, it must reset this parameter back to the
default state after the workaround completes.

Bug: 1022080
Change-Id: I84870f1264311c106ebece1e6a37d5f92a1da28c
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1904627
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Jonah Ryan-Davis <jonahr@google.com>

src/libANGLE/renderer/gl/BlitGL.cpp

diff --git a/src/libANGLE/renderer/gl/BlitGL.cpp b/src/libANGLE/renderer/gl/BlitGL.cpp
index a7e16c1..c5bbe9e 100644
--- a/src/libANGLE/renderer/gl/BlitGL.cpp
+++ b/src/libANGLE/renderer/gl/BlitGL.cpp
@@ -1048,6 +1048,9 @@
         gl::PixelUnpackState unpack;
         mStateManager->setPixelUnpackState(unpack);
         mStateManager->setPixelUnpackBuffer(nullptr);
+        GLint swizzle[4] = {GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA};
+        ANGLE_GL_TRY(context,
+                     mFunctions->texParameteriv(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_RGBA, swizzle));
         ANGLE_GL_TRY(context, mFunctions->texImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, 0, GL_RGBA,
                                                      GL_UNSIGNED_BYTE, nullptr));
     }