commit 064458a8f818a34b07035780a547c50e07610df3
author Olli Etuaho <oetuaho@nvidia.com> Thu Aug 30 14:02:02 2018 +0300
committer Commit Bot <commit-bot@chromium.org> Fri Aug 31 14:04:58 2018 +0000
tree dcff225b7374c2e1daf1e8125a30e38c8a3870e8
parent fd1621076a74a080c8f2f3e707d8f8d1fef0f49f

Remove separate ANGLE_texture_multisample_array

We can just expose OES_texture_storage_multisample_2d_array instead.
The compiler was already changed to accept
OES_texture_storage_multisample_2d_array, and now the change is made
also at the API level.

Out-of-bounds access guarantees provided by ANGLE were the only big
difference between the ANGLE spec and the OES spec, so it's simpler
to just expose the native extension. Safe out-of-bounds accesses can
be guaranteed without having them in the extension spec.

This also adds missing texStorage3DMultisample entry point to the proc
table, which will enable running dEQP tests.

BUG=angleproject:2775
TEST=angle_end2end_tests

Change-Id: Idf376ee877a3374a33de177df023f0531ec8f01d
Reviewed-on: https://chromium-review.googlesource.com/1196722
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

src/libANGLE/validationES31.cpp

diff --git a/src/libANGLE/validationES31.cpp b/src/libANGLE/validationES31.cpp
index e7ebf43..2738c43 100644
--- a/src/libANGLE/validationES31.cpp
+++ b/src/libANGLE/validationES31.cpp
@@ -1954,17 +1954,17 @@
     return true;
 }
 
-// GL_ANGLE_texture_multisample_array
-bool ValidateTexStorage3DMultisampleANGLE(Context *context,
-                                          TextureType target,
-                                          GLsizei samples,
-                                          GLint sizedinternalformat,
-                                          GLsizei width,
-                                          GLsizei height,
-                                          GLsizei depth,
-                                          GLboolean fixedsamplelocations)
+// GL_OES_texture_storage_multisample_2d_array
+bool ValidateTexStorage3DMultisampleOES(Context *context,
+                                        TextureType target,
+                                        GLsizei samples,
+                                        GLint sizedinternalformat,
+                                        GLsizei width,
+                                        GLsizei height,
+                                        GLsizei depth,
+                                        GLboolean fixedsamplelocations)
 {
-    if (!context->getExtensions().textureMultisampleArray)
+    if (!context->getExtensions().textureStorageMultisample2DArray)
     {
         ANGLE_VALIDATION_ERR(context, InvalidEnum(), MultisampleArrayExtensionRequired);
         return false;
@@ -1972,7 +1972,7 @@
 
     if (target != TextureType::_2DMultisampleArray)
     {
-        ANGLE_VALIDATION_ERR(context, InvalidEnum(), TargetMustBeTexture2DMultisampleArrayANGLE);
+        ANGLE_VALIDATION_ERR(context, InvalidEnum(), TargetMustBeTexture2DMultisampleArrayOES);
         return false;
     }