commit 0c09e265c386eacd5367d1eed7503d27d2d83c1d
author Geoff Lang <geofflang@chromium.org> Wed May 03 09:43:13 2017 -0400
committer Geoff Lang <geofflang@chromium.org> Thu May 11 16:23:06 2017 +0000
tree 75a3240c1df583367af643b0800644d6318b1637
parent 29e9035d00931909e9b6e5bd2ebdf0c8a6fdaf5c

Add BGRA formats to glCopyTexSubImage validation.

These formats were already accepted by glCopyTexImage and allow
glCopyTexSubImage to work on the default framebuffer for D3D9 and D3D11.

BUG=angleproject:2027

Change-Id: I5d8b839ae2c69e1e8381aa011df6223e18afb308
Reviewed-on: https://chromium-review.googlesource.com/493803
Reviewed-by: Jamie Madill <jmadill@chromium.org>

src/libANGLE/validationES2.cpp

diff --git a/src/libANGLE/validationES2.cpp b/src/libANGLE/validationES2.cpp
index 1d73ae1..1a76d21 100644
--- a/src/libANGLE/validationES2.cpp
+++ b/src/libANGLE/validationES2.cpp
@@ -380,7 +380,8 @@
         {
             case GL_ALPHA:
                 if (colorbufferFormat != GL_ALPHA8_EXT && colorbufferFormat != GL_RGBA4 &&
-                    colorbufferFormat != GL_RGB5_A1 && colorbufferFormat != GL_RGBA8_OES)
+                    colorbufferFormat != GL_RGB5_A1 && colorbufferFormat != GL_RGBA8_OES &&
+                    colorbufferFormat != GL_BGRA8_EXT && colorbufferFormat != GL_BGR5_A1_ANGLEX)
                 {
                     context->handleError(Error(GL_INVALID_OPERATION));
                     return false;
@@ -390,7 +391,8 @@
                 if (colorbufferFormat != GL_R8_EXT && colorbufferFormat != GL_RG8_EXT &&
                     colorbufferFormat != GL_RGB565 && colorbufferFormat != GL_RGB8_OES &&
                     colorbufferFormat != GL_RGBA4 && colorbufferFormat != GL_RGB5_A1 &&
-                    colorbufferFormat != GL_RGBA8_OES)
+                    colorbufferFormat != GL_RGBA8_OES && colorbufferFormat != GL_BGRA8_EXT &&
+                    colorbufferFormat != GL_BGR5_A1_ANGLEX)
                 {
                     context->handleError(Error(GL_INVALID_OPERATION));
                     return false;
@@ -402,7 +404,8 @@
                     colorbufferFormat != GL_RGBA4 && colorbufferFormat != GL_RGB5_A1 &&
                     colorbufferFormat != GL_RGBA8_OES && colorbufferFormat != GL_R32F &&
                     colorbufferFormat != GL_RG32F && colorbufferFormat != GL_RGB32F &&
-                    colorbufferFormat != GL_RGBA32F)
+                    colorbufferFormat != GL_RGBA32F && colorbufferFormat != GL_BGRA8_EXT &&
+                    colorbufferFormat != GL_BGR5_A1_ANGLEX)
                 {
                     context->handleError(Error(GL_INVALID_OPERATION));
                     return false;
@@ -413,7 +416,8 @@
                     colorbufferFormat != GL_RGB8_OES && colorbufferFormat != GL_RGBA4 &&
                     colorbufferFormat != GL_RGB5_A1 && colorbufferFormat != GL_RGBA8_OES &&
                     colorbufferFormat != GL_RG32F && colorbufferFormat != GL_RGB32F &&
-                    colorbufferFormat != GL_RGBA32F)
+                    colorbufferFormat != GL_RGBA32F && colorbufferFormat != GL_BGRA8_EXT &&
+                    colorbufferFormat != GL_BGR5_A1_ANGLEX)
                 {
                     context->handleError(Error(GL_INVALID_OPERATION));
                     return false;
@@ -423,7 +427,8 @@
                 if (colorbufferFormat != GL_RGB565 && colorbufferFormat != GL_RGB8_OES &&
                     colorbufferFormat != GL_RGBA4 && colorbufferFormat != GL_RGB5_A1 &&
                     colorbufferFormat != GL_RGBA8_OES && colorbufferFormat != GL_RGB32F &&
-                    colorbufferFormat != GL_RGBA32F)
+                    colorbufferFormat != GL_RGBA32F && colorbufferFormat != GL_BGRA8_EXT &&
+                    colorbufferFormat != GL_BGR5_A1_ANGLEX)
                 {
                     context->handleError(Error(GL_INVALID_OPERATION));
                     return false;
@@ -432,7 +437,8 @@
             case GL_LUMINANCE_ALPHA:
             case GL_RGBA:
                 if (colorbufferFormat != GL_RGBA4 && colorbufferFormat != GL_RGB5_A1 &&
-                    colorbufferFormat != GL_RGBA8_OES && colorbufferFormat != GL_RGBA32F)
+                    colorbufferFormat != GL_RGBA8_OES && colorbufferFormat != GL_RGBA32F &&
+                    colorbufferFormat != GL_BGRA8_EXT && colorbufferFormat != GL_BGR5_A1_ANGLEX)
                 {
                     context->handleError(Error(GL_INVALID_OPERATION));
                     return false;