commit cdacacdd2be9c0cb2fba1b7373fb4639b0b9e8ef
author Geoff Lang <geofflang@chromium.org> Thu Apr 24 12:01:56 2014 -0400
committer Geoff Lang <geofflang@chromium.org> Thu Apr 24 17:56:31 2014 +0000
tree d3de12ef69ec11032e5a60270157044ff1dfb885
parent f67115ce37b89380847cfd9a1009781ac06ffaaa

Add validation for unsized BGRA texture formats.

BUG=angle:620

Change-Id: I956b7fc4ed0be99239e4ed1c63b51732727cc87f
Reviewed-on: https://chromium-review.googlesource.com/196840
Tested-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>

src/libGLESv2/formatutils.cpp

diff --git a/src/libGLESv2/formatutils.cpp b/src/libGLESv2/formatutils.cpp
index 973b0c4..3aac25e 100644
--- a/src/libGLESv2/formatutils.cpp
+++ b/src/libGLESv2/formatutils.cpp
@@ -319,6 +319,9 @@
     set.insert(FormatInfo(GL_LUMINANCE,          GL_LUMINANCE,       GL_HALF_FLOAT                    ));
     set.insert(FormatInfo(GL_ALPHA,              GL_ALPHA,           GL_HALF_FLOAT                    ));
 
+    // From GL_EXT_texture_format_BGRA8888
+    set.insert(FormatInfo(GL_BGRA_EXT,           GL_BGRA_EXT,        GL_UNSIGNED_BYTE                 ));
+
     // From GL_EXT_texture_storage
     //                   | Internal format          | Format            | Type                            |
     //                   |                          |                   |                                 |
@@ -332,6 +335,7 @@
     set.insert(FormatInfo(GL_LUMINANCE16F_EXT,       GL_LUMINANCE,       GL_HALF_FLOAT                    ));
     set.insert(FormatInfo(GL_LUMINANCE_ALPHA16F_EXT, GL_LUMINANCE_ALPHA, GL_HALF_FLOAT                    ));
 
+    // From GL_EXT_texture_storage and GL_EXT_texture_format_BGRA8888
     set.insert(FormatInfo(GL_BGRA8_EXT,              GL_BGRA_EXT,        GL_UNSIGNED_BYTE                 ));
     set.insert(FormatInfo(GL_BGRA4_ANGLEX,           GL_BGRA_EXT,        GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT));
     set.insert(FormatInfo(GL_BGRA4_ANGLEX,           GL_BGRA_EXT,        GL_UNSIGNED_BYTE                 ));