Vulkan: Enable OES_texture_storage_multisample_2d_array

src/libANGLE/ErrorStrings.h

@@ -454,6 +454,7 @@ MSG kTextureTargetRequiresES31 = "Texture target requires at least OpenGL ES 3.1
 MSG kTextureTypeConflict = "Two textures of different types use the same sampler location.";
 MSG kTextureTypeMismatch = "Passed in texture type must match the one originally used to define the texture.";
 MSG kTextureWidthOrHeightOutOfRange = "Width and height must be less than or equal to GL_MAX_TEXTURE_SIZE.";
+MSG kTextureDepthOutOfRange = "Depth must be less than or equal to MAX_ARRAY_TEXTURE_LAYERS";
 MSG kTransfomFeedbackAlreadyActive = "Transform feedback is already active.";
 MSG kTransformFeedbackActiveDelete = "Attempt to delete an active transform feedback.";
 MSG kTransformFeedbackActiveDuringLink = "Cannot link program while program is associated with an active transform feedback object.";

src/libANGLE/renderer/vulkan/FramebufferVk.cpp

@@ -863,8 +863,8 @@ angle::Result FramebufferVk::blit(const gl::Context *context,
            (sourceArea.x == destArea.x && sourceArea.y == destArea.y &&
             sourceArea.width == destArea.width && sourceArea.height == destArea.height));
 
-    gl::Rectangle srcFramebufferDimensions  = srcFramebufferVk->mState.getDimensions().toRect();
-    gl::Rectangle destFramebufferDimensions = mState.getDimensions().toRect();
+    gl::Rectangle srcFramebufferDimensions  = srcFramebufferVk->getNonRotatedCompleteRenderArea();
+    gl::Rectangle destFramebufferDimensions = getNonRotatedCompleteRenderArea();
 
     // If the destination is flipped in either direction, we will flip the source instead so that
     // the destination area is always unflipped.

src/libANGLE/renderer/vulkan/vk_caps_utils.cpp

@@ -87,6 +87,8 @@ void RendererVk::ensureCapsInitialized() const
         getFeatures().enableMultisampledRenderToTexture.enabled;
     mNativeExtensions.multisampledRenderToTexture2 =
         getFeatures().enableMultisampledRenderToTexture.enabled;
+    mNativeExtensions.textureStorageMultisample2DArrayOES =
+        (limitsVk.standardSampleLocations == VK_TRUE);
     mNativeExtensions.copyTexture           = true;
     mNativeExtensions.copyTexture3d         = true;
     mNativeExtensions.copyCompressedTexture = true;

src/libANGLE/validationES31.cpp

@@ -2075,6 +2075,12 @@ bool ValidateTexStorage3DMultisampleOES(const Context *context,
         return false;
     }
 
+    if (depth > context->getCaps().maxArrayTextureLayers)
+    {
+        context->validationError(GL_INVALID_VALUE, kTextureDepthOutOfRange);
+        return false;
+    }
+
     return ValidateTexStorageMultisample(context, target, samples, sizedinternalformat, width,
                                          height);
 }