commit 4e58af614176072943bdb302b2395dd85a398514
author Geoff Lang <geofflang@chromium.org> Fri Aug 26 10:56:52 2016 -0400
committer Commit Bot <commit-bot@chromium.org> Mon Aug 29 17:30:29 2016 +0000
tree 4a7b4b63264c79eb5c012287076fb24dd0f8813d
parent b920e360163336ce4b0deb08a53c4e4de8bd50d6

Add missing TexImage and CopyTexImage format combinations for ES3.

 * Some unsized DEPTH_COMPONENT combinations were not added to the validation
   tables for the ANGLE_depth_texture extension.
 * The HALF_FLOAT_OES format was not validated in ES3 for RGB and RGBA formats
   when the OES_texture_half_float extension is supported.
 * BGRA->BGRA CopyTexImage validation was missing.

No more errors are generated within ANGLE when visiting
http://alteredqualia.com/tools/webgl-features/

BUG=605754

Change-Id: If654c34adcebb4cd3eaa994ad7e912f6ffa4df55
Reviewed-on: https://chromium-review.googlesource.com/376281
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Geoff Lang <geofflang@chromium.org>

src/libANGLE/validationES3.cpp

diff --git a/src/libANGLE/validationES3.cpp b/src/libANGLE/validationES3.cpp
index d4f706b..6f3d800 100644
--- a/src/libANGLE/validationES3.cpp
+++ b/src/libANGLE/validationES3.cpp
@@ -53,6 +53,7 @@
 
     // Format combinations from ES 3.0.1 spec, table 3.2
 
+    // clang-format off
     //                        | Internal format      | Format            | Type                            |
     //                        |                      |                   |                                 |
     InsertES3FormatCombo(&set, GL_RGBA8,              GL_RGBA,            GL_UNSIGNED_BYTE                 );
@@ -164,6 +165,8 @@
     InsertES3FormatCombo(&set, GL_ALPHA,              GL_ALPHA,           GL_FLOAT                         );
 
     // From GL_OES_texture_half_float
+    InsertES3FormatCombo(&set, GL_RGBA,               GL_RGBA,            GL_HALF_FLOAT_OES                );
+    InsertES3FormatCombo(&set, GL_RGB,                GL_RGB,             GL_HALF_FLOAT_OES                );
     InsertES3FormatCombo(&set, GL_LUMINANCE_ALPHA,    GL_LUMINANCE_ALPHA, GL_HALF_FLOAT                    );
     InsertES3FormatCombo(&set, GL_LUMINANCE_ALPHA,    GL_LUMINANCE_ALPHA, GL_HALF_FLOAT_OES                );
     InsertES3FormatCombo(&set, GL_LUMINANCE,          GL_LUMINANCE,       GL_HALF_FLOAT                    );
@@ -197,8 +200,10 @@
     InsertES3FormatCombo(&set, GL_BGR5_A1_ANGLEX,         GL_BGRA_EXT,        GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT);
     InsertES3FormatCombo(&set, GL_BGR5_A1_ANGLEX,         GL_BGRA_EXT,        GL_UNSIGNED_BYTE                 );
 
-    // From GL_ANGLE_depth_texture
+    // From GL_ANGLE_depth_texture and OES_depth_texture
     InsertES3FormatCombo(&set, GL_DEPTH_COMPONENT32_OES,  GL_DEPTH_COMPONENT, GL_UNSIGNED_INT_24_8_OES         );
+    InsertES3FormatCombo(&set, GL_DEPTH_COMPONENT,        GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT                );
+    InsertES3FormatCombo(&set, GL_DEPTH_COMPONENT,        GL_DEPTH_COMPONENT, GL_UNSIGNED_INT                  );
 
     // From GL_EXT_texture_norm16
     InsertES3FormatCombo(&set, GL_R16_EXT, GL_RED, GL_UNSIGNED_SHORT);
@@ -209,6 +214,7 @@
     InsertES3FormatCombo(&set, GL_RG16_SNORM_EXT, GL_RG, GL_SHORT);
     InsertES3FormatCombo(&set, GL_RGB16_SNORM_EXT, GL_RGB, GL_SHORT);
     InsertES3FormatCombo(&set, GL_RGBA16_SNORM_EXT, GL_RGBA, GL_SHORT);
+    // clang-format on
 
     return set;
 }
@@ -750,6 +756,7 @@
     set.insert(CopyConversion(GL_RG, GL_BGRA_EXT));
     set.insert(CopyConversion(GL_RGB, GL_BGRA_EXT));
     set.insert(CopyConversion(GL_RGBA, GL_BGRA_EXT));
+    set.insert(CopyConversion(GL_BGRA_EXT, GL_BGRA_EXT));
 
     set.insert(CopyConversion(GL_RED_INTEGER, GL_RED_INTEGER));
     set.insert(CopyConversion(GL_RED_INTEGER, GL_RG_INTEGER));