EGL: Add support for GL_EXT_EGL_image_array extension

Mohan Maiya · Commit Bot · commit daed369cfdb6 · 2020-05-06T00:16:16.000Z
Add support for creating 2D array EGLImages. 2D array textures are core in GLES3.0. Enable the eglImageArray bool that controls exposure of the extension for all contexts >= GLES3.0 Bug: angleproject:4604 Tests: angle_end2end_tests --gtest_filter=ImageTest.*2DArray* Change-Id: Iebc1ad184fe7209ca89d620290337438ac251c56 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2176109 Commit-Queue: Mohan Maiya <m.maiya@samsung.com> Reviewed-by: Geoff Lang <geofflang@chromium.org>
diff --git a/scripts/code_generation_hashes/GL_EGL_WGL_loader.json b/scripts/code_generation_hashes/GL_EGL_WGL_loader.json
@@ -10,7 +10,7 @@
   "scripts/gl_angle_ext.xml":
     "079cc4829de7ce638faf7bbf66e141ad",
   "scripts/registry_xml.py":
-    "d48b9fcf30e2f98210f0b98824e7bd49",
+    "b2902e02f495a9cc85082c47e7b73ac9",
   "scripts/wgl.xml":
     "aa96419c582af2f6673430e2847693f4",
   "src/libEGL/egl_loader_autogen.cpp":
diff --git a/scripts/code_generation_hashes/GL_EGL_entry_points.json b/scripts/code_generation_hashes/GL_EGL_entry_points.json
@@ -12,7 +12,7 @@
   "scripts/gl_angle_ext.xml":
     "079cc4829de7ce638faf7bbf66e141ad",
   "scripts/registry_xml.py":
-    "d48b9fcf30e2f98210f0b98824e7bd49",
+    "b2902e02f495a9cc85082c47e7b73ac9",
   "scripts/wgl.xml":
     "aa96419c582af2f6673430e2847693f4",
   "src/libANGLE/Context_gl_1_0_autogen.h":
@@ -64,7 +64,7 @@
   "src/libANGLE/Context_gles_3_2_autogen.h":
     "e26f7ee7b59a89a4f5337171816b8336",
   "src/libANGLE/Context_gles_ext_autogen.h":
-    "c4882553e6cef2a53b922ebe9ec88556",
+    "70b088f16d539f1fe7f3ec39a2fd2c34",
   "src/libANGLE/capture_gles_1_0_autogen.cpp":
     "96fc0f501e2e696ab911dad8b400dfb2",
   "src/libANGLE/capture_gles_1_0_autogen.h":
@@ -88,7 +88,7 @@
   "src/libANGLE/capture_gles_ext_autogen.cpp":
     "96cb5043ebfce349c89ece3afec6d9f8",
   "src/libANGLE/capture_gles_ext_autogen.h":
-    "f6604f279558cf5d965e3dce61e0dc91",
+    "2993ff4c127fb3dca52c96b4a86d7f69",
   "src/libANGLE/entry_points_enum_autogen.cpp":
     "66f09d4f9e6f8e83f2f6f0cf8fc3f3d9",
   "src/libANGLE/entry_points_enum_autogen.h":
@@ -110,7 +110,7 @@
   "src/libANGLE/validationES3_autogen.h":
     "86ba503835328438158d9a464943f3bd",
   "src/libANGLE/validationESEXT_autogen.h":
-    "a48272ec357016df88899f85ad33d0ef",
+    "9a7f7c129e12ab2660f1ef5d6dd73cd5",
   "src/libANGLE/validationGL11_autogen.h":
     "aadd145c1404de9c34d6b7c00404f10f",
   "src/libANGLE/validationGL12_autogen.h":
@@ -250,15 +250,15 @@
   "src/libGLESv2/entry_points_gles_3_2_autogen.h":
     "5798aa0a73af1d4ba5dfe99b6217a247",
   "src/libGLESv2/entry_points_gles_ext_autogen.cpp":
-    "b10a0a6c1becd3bfc8149c29dfc268b1",
+    "f24b9311081f4307a4b02cec669753b9",
   "src/libGLESv2/entry_points_gles_ext_autogen.h":
-    "b564ae1ca4e312bd9d8138f593d8110c",
+    "97bdf48e620471b21e3d250254ac847f",
   "src/libGLESv2/libGLESv2_autogen.cpp":
-    "0f02d0cef8752453648ea10862a63535",
+    "0d79a167f0e86a7adcdebfe26ed331a9",
   "src/libGLESv2/libGLESv2_autogen.def":
-    "266fc07e2657fc96eabb4ae29f330e07",
+    "ff7562ae9bdf8763fea7ba09e5cbb1b4",
   "src/libGLESv2/libGLESv2_no_capture_autogen.def":
-    "f67114b49f9dcd1b7f9d5abaf0dfe190",
+    "affecd039c50674887d6c7bd9b06d4ce",
   "src/libGLESv2/libGLESv2_with_capture_autogen.def":
-    "5e272fd38bfe01cf0a31def20d9b70e8"
+    "5a9fce5f01b3b2150cbce447f02e7873"
 }
diff --git a/scripts/code_generation_hashes/GLenum_value_to_string_map.json b/scripts/code_generation_hashes/GLenum_value_to_string_map.json
@@ -6,7 +6,7 @@
   "scripts/gl_angle_ext.xml":
     "079cc4829de7ce638faf7bbf66e141ad",
   "scripts/registry_xml.py":
-    "d48b9fcf30e2f98210f0b98824e7bd49",
+    "b2902e02f495a9cc85082c47e7b73ac9",
   "src/libANGLE/gl_enum_utils_autogen.cpp":
     "48627c0865d15bf4014327de5858d3c5",
   "src/libANGLE/gl_enum_utils_autogen.h":
diff --git a/scripts/code_generation_hashes/proc_table.json b/scripts/code_generation_hashes/proc_table.json
@@ -10,7 +10,7 @@
   "scripts/gl_angle_ext.xml":
     "079cc4829de7ce638faf7bbf66e141ad",
   "scripts/registry_xml.py":
-    "d48b9fcf30e2f98210f0b98824e7bd49",
+    "b2902e02f495a9cc85082c47e7b73ac9",
   "scripts/wgl.xml":
     "aa96419c582af2f6673430e2847693f4",
   "src/libGL/proc_table_wgl_autogen.cpp":
diff --git a/scripts/registry_xml.py b/scripts/registry_xml.py
@@ -68,6 +68,7 @@
     "GL_EXT_draw_buffers",
     "GL_EXT_draw_buffers_indexed",
     "GL_EXT_draw_elements_base_vertex",
+    "GL_EXT_EGL_image_array",
     "GL_EXT_geometry_shader",
     "GL_EXT_instanced_arrays",
     "GL_EXT_map_buffer_range",
diff --git a/src/libANGLE/Caps.cpp b/src/libANGLE/Caps.cpp
@@ -1012,6 +1012,7 @@ const ExtensionInfoMap &GetExtensionInfoMap()
         map["GL_EXT_draw_elements_base_vertex"] = enableableExtension(&Extensions::drawElementsBaseVertexEXT);
         map["GL_EXT_gpu_shader5"] = enableableExtension(&Extensions::gpuShader5EXT);
         map["GL_APPLE_clip_distance"] = enableableExtension(&Extensions::clipDistanceAPPLE);
+        map["GL_EXT_EGL_image_array"] = enableableExtension(&Extensions::eglImageArray);
         // GLES1 extensions
         map["GL_OES_point_size_array"] = enableableExtension(&Extensions::pointSizeArrayOES);
         map["GL_OES_texture_cube_map"] = enableableExtension(&Extensions::textureCubeMapOES);
diff --git a/src/libANGLE/Caps.h b/src/libANGLE/Caps.h
@@ -501,6 +501,9 @@ struct Extensions
     // GL_CHROMIUM_color_buffer_float_rgba
     bool colorBufferFloatRGBA = false;
 
+    // GL_EXT_EGL_image_array
+    bool eglImageArray = false;
+
     // ES3 Extension support
 
     // GL_EXT_color_buffer_float
diff --git a/src/libANGLE/Context.cpp b/src/libANGLE/Context.cpp
@@ -3099,6 +3099,7 @@ Extensions Context::generateSupportedExtensions() const
         supportedExtensions.textureMultisample       = false;
         supportedExtensions.drawBuffersIndexedEXT    = false;
         supportedExtensions.drawBuffersIndexedOES    = false;
+        supportedExtensions.eglImageArray            = false;
 
         // Requires glCompressedTexImage3D
         supportedExtensions.textureCompressionASTCOES = false;
diff --git a/src/libANGLE/Context_gles_ext_autogen.h b/src/libANGLE/Context_gles_ext_autogen.h
@@ -273,6 +273,7 @@
     /* GL_ANGLE_translated_shader_source */                                                        \
     void getTranslatedShaderSource(ShaderProgramID shaderPacked, GLsizei bufsize, GLsizei *length, \
                                    GLchar *source);                                                \
+    /* GL_EXT_EGL_image_array */                                                                   \
     /* GL_EXT_blend_func_extended */                                                               \
     void bindFragDataLocation(ShaderProgramID programPacked, GLuint color, const GLchar *name);    \
     void bindFragDataLocationIndexed(ShaderProgramID programPacked, GLuint colorNumber,            \
diff --git a/src/libANGLE/Image.cpp b/src/libANGLE/Image.cpp
@@ -388,6 +388,11 @@ size_t Image::getHeight() const
     return mState.size.height;
 }
 
+bool Image::isLayered() const
+{
+    return mState.imageIndex.isLayered();
+}
+
 size_t Image::getSamples() const
 {
     return mState.samples;
diff --git a/src/libANGLE/Image.h b/src/libANGLE/Image.h
@@ -156,6 +156,7 @@ class Image final : public RefCountObject, public LabeledObject
     bool isTexturable(const gl::Context *context) const;
     size_t getWidth() const;
     size_t getHeight() const;
+    bool isLayered() const;
     size_t getSamples() const;
 
     Error initialize(const Display *display);
diff --git a/src/libANGLE/Texture.cpp b/src/libANGLE/Texture.cpp
@@ -1621,7 +1621,8 @@ angle::Result Texture::setEGLImageTarget(Context *context,
                                          egl::Image *imageTarget)
 {
     ASSERT(type == mState.mType);
-    ASSERT(type == TextureType::_2D || type == TextureType::External);
+    ASSERT(type == TextureType::_2D || type == TextureType::External ||
+           type == TextureType::_2DArray);
 
     // Release from previous calls to eglBindTexImage, to avoid calling the Impl after
     ANGLE_TRY(releaseTexImageInternal(context));
diff --git a/src/libANGLE/capture_gles_ext_autogen.h b/src/libANGLE/capture_gles_ext_autogen.h
@@ -814,6 +814,8 @@ angle::CallCapture CaptureLoseContextCHROMIUM(const State &glState,
                                               GraphicsResetStatus currentPacked,
                                               GraphicsResetStatus otherPacked);
 
+// GL_EXT_EGL_image_array
+
 // GL_EXT_blend_func_extended
 angle::CallCapture CaptureBindFragDataLocationEXT(const State &glState,
                                                   bool isCallValid,
diff --git a/src/libANGLE/renderer/gl/renderergl_utils.cpp b/src/libANGLE/renderer/gl/renderergl_utils.cpp
@@ -1255,6 +1255,7 @@ void GenerateCaps(const FunctionsGL *functions,
         functions->hasExtension("GL_EXT_EGL_image_external_wrap_modes");
     extensions->eglImageExternalEssl3OES =
         functions->hasGLESExtension("GL_OES_EGL_image_external_essl3");
+    extensions->eglImageArray = functions->hasGLESExtension("GL_EXT_EGL_image_array");
 
     extensions->eglSyncOES = functions->hasGLESExtension("GL_OES_EGL_sync");
 
diff --git a/src/libANGLE/renderer/null/ContextNULL.cpp b/src/libANGLE/renderer/null/ContextNULL.cpp
@@ -99,6 +99,7 @@ ContextNULL::ContextNULL(const gl::State &state,
     mExtensions.eglImageOES                 = true;
     mExtensions.eglImageExternalOES         = true;
     mExtensions.eglImageExternalEssl3OES    = true;
+    mExtensions.eglImageArray               = true;
     mExtensions.eglStreamConsumerExternalNV = true;
 
     const gl::Version maxClientVersion(3, 1);
diff --git a/src/libANGLE/renderer/vulkan/vk_caps_utils.cpp b/src/libANGLE/renderer/vulkan/vk_caps_utils.cpp
@@ -109,9 +109,9 @@ void RendererVk::ensureCapsInitialized() const
     mNativeExtensions.eglImageExternalOES          = true;
     mNativeExtensions.eglImageExternalWrapModesEXT = true;
     mNativeExtensions.eglImageExternalEssl3OES     = true;
-
-    mNativeExtensions.memoryObject   = true;
-    mNativeExtensions.memoryObjectFd = getFeatures().supportsExternalMemoryFd.enabled;
+    mNativeExtensions.eglImageArray                = true;
+    mNativeExtensions.memoryObject                 = true;
+    mNativeExtensions.memoryObjectFd               = getFeatures().supportsExternalMemoryFd.enabled;
     mNativeExtensions.memoryObjectFuchsiaANGLE =
         getFeatures().supportsExternalMemoryFuchsia.enabled;
 
diff --git a/src/libANGLE/validationES.cpp b/src/libANGLE/validationES.cpp
@@ -3580,6 +3580,13 @@ bool ValidateEGLImageTargetTexture2DOES(const Context *context,
             }
             break;
 
+        case TextureType::_2DArray:
+            if (!context->getExtensions().eglImageArray)
+            {
+                context->validationError(GL_INVALID_ENUM, kEnumNotSupported);
+            }
+            break;
+
         case TextureType::External:
             if (!context->getExtensions().eglImageExternalOES)
             {
@@ -3613,6 +3620,13 @@ bool ValidateEGLImageTargetTexture2DOES(const Context *context,
         return false;
     }
 
+    if (imageObject->isLayered() && type != TextureType::_2DArray)
+    {
+        context->validationError(GL_INVALID_OPERATION,
+                                 "Image has more than 1 layer, target must be TEXTURE_2D_ARRAY");
+        return false;
+    }
+
     return true;
 }
 
diff --git a/src/libANGLE/validationESEXT_autogen.h b/src/libANGLE/validationESEXT_autogen.h
@@ -701,6 +701,8 @@ bool ValidateLoseContextCHROMIUM(const Context *context,
                                  GraphicsResetStatus currentPacked,
                                  GraphicsResetStatus otherPacked);
 
+// GL_EXT_EGL_image_array
+
 // GL_EXT_blend_func_extended
 bool ValidateBindFragDataLocationEXT(const Context *context,
                                      ShaderProgramID programPacked,
diff --git a/src/libGLESv2/entry_points_gles_ext_autogen.cpp b/src/libGLESv2/entry_points_gles_ext_autogen.cpp
@@ -3066,6 +3066,8 @@ void GL_APIENTRY LoseContextCHROMIUM(GLenum current, GLenum other)
     }
 }
 
+// GL_EXT_EGL_image_array
+
 // GL_EXT_blend_func_extended
 void GL_APIENTRY BindFragDataLocationEXT(GLuint program, GLuint color, const GLchar *name)
 {
diff --git a/src/libGLESv2/entry_points_gles_ext_autogen.h b/src/libGLESv2/entry_points_gles_ext_autogen.h
@@ -605,6 +605,8 @@ ANGLE_EXPORT void GL_APIENTRY CoverageModulationCHROMIUM(GLenum components);
 // GL_CHROMIUM_lose_context
 ANGLE_EXPORT void GL_APIENTRY LoseContextCHROMIUM(GLenum current, GLenum other);
 
+// GL_EXT_EGL_image_array
+
 // GL_EXT_blend_func_extended
 ANGLE_EXPORT void GL_APIENTRY BindFragDataLocationEXT(GLuint program,
                                                       GLuint color,
diff --git a/src/libGLESv2/libGLESv2_autogen.cpp b/src/libGLESv2/libGLESv2_autogen.cpp
@@ -3707,6 +3707,8 @@ void GL_APIENTRY glLoseContextCHROMIUM(GLenum current, GLenum other)
     return gl::LoseContextCHROMIUM(current, other);
 }
 
+// GL_EXT_EGL_image_array
+
 // GL_EXT_blend_func_extended
 void GL_APIENTRY glBindFragDataLocationEXT(GLuint program, GLuint color, const GLchar *name)
 {
diff --git a/src/libGLESv2/libGLESv2_autogen.def b/src/libGLESv2/libGLESv2_autogen.def
@@ -602,6 +602,8 @@ EXPORTS
     ; GL_CHROMIUM_lose_context
     glLoseContextCHROMIUM
 
+    ; GL_EXT_EGL_image_array
+
     ; GL_EXT_blend_func_extended
     glBindFragDataLocationEXT
     glBindFragDataLocationIndexedEXT
diff --git a/src/libGLESv2/libGLESv2_no_capture_autogen.def b/src/libGLESv2/libGLESv2_no_capture_autogen.def
@@ -602,6 +602,8 @@ EXPORTS
     ; GL_CHROMIUM_lose_context
     glLoseContextCHROMIUM
 
+    ; GL_EXT_EGL_image_array
+
     ; GL_EXT_blend_func_extended
     glBindFragDataLocationEXT
     glBindFragDataLocationIndexedEXT
diff --git a/src/libGLESv2/libGLESv2_with_capture_autogen.def b/src/libGLESv2/libGLESv2_with_capture_autogen.def
@@ -602,6 +602,8 @@ EXPORTS
     ; GL_CHROMIUM_lose_context
     glLoseContextCHROMIUM
 
+    ; GL_EXT_EGL_image_array
+
     ; GL_EXT_blend_func_extended
     glBindFragDataLocationEXT
     glBindFragDataLocationIndexedEXT
diff --git a/src/tests/gl_tests/ImageTest.cpp b/src/tests/gl_tests/ImageTest.cpp

Original file line number	Diff line number	Diff line change
`@@ -388,6 +388,11 @@ size_t Image::getHeight() const`
`388`	`388`	`return mState.size.height;`
`389`	`389`	`}`
`390`	`390`
	`391`	`+bool Image::isLayered() const`
	`392`	`+{`
	`393`	`+ return mState.imageIndex.isLayered();`
	`394`	`+}`
	`395`	`+`
`391`	`396`	`size_t Image::getSamples() const`
`392`	`397`	`{`
`393`	`398`	`return mState.samples;`