Fix CopyTextureTestES3.ES3FloatFormats for VK

When enabled, this would crash in debug because mFormat would be nullptr on the target VkTexture, and the ASSERT would access mFormat via getAspectFlags(). Fixed this by only calling getAspectFlags() if mFormat is valid. I'm not sure this was the original reason this test was disabled, but they pass now on SwiftShader. Bug: angleproject:4092 Change-Id: I9b04bbc61dde14f722d3a510f3d38776f4f6c7ac Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2221420Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Antonio Maiorano <amaiorano@google.com>

Fix CopyTextureTestES3.ES3FloatFormats for VK
9905f7f5 · Antonio Maiorano · Commit Bot · 56a4cc12 · 9905f7f5 · 9905f7f5
Commit 9905f7f5 authored May 29, 2020 by Antonio Maiorano Committed by Commit Bot May 29, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

vk_helpers.cpp src/libANGLE/renderer/vulkan/vk_helpers.cpp +1 -1

CopyTextureTest.cpp src/tests/gl_tests/CopyTextureTest.cpp +0 -2

No files found.
--- a/src/libANGLE/renderer/vulkan/vk_helpers.cpp
+++ b/src/libANGLE/renderer/vulkan/vk_helpers.cpp
@@ -3537,7 +3537,7 @@ angle::Result ImageHelper::stageSubresourceUpdateAndGetData(ContextVk *contextVk
    copy.imageSubresource.layerCount     = imageIndex.getLayerCount();
    // Note: Only support color now
-    ASSERT(getAspectFlags() == VK_IMAGE_ASPECT_COLOR_BIT);
+    ASSERT((mFormat == nullptr) || (getAspectFlags() == VK_IMAGE_ASPECT_COLOR_BIT));
    gl_vk::GetOffset(offset, &copy.imageOffset);
    gl_vk::GetExtent(glExtents, &copy.imageExtent);

--- a/src/tests/gl_tests/CopyTextureTest.cpp
+++ b/src/tests/gl_tests/CopyTextureTest.cpp
@@ -1822,8 +1822,6 @@ TEST_P(CopyTextureTestES3, ES3FloatFormats)
    }
    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_color_buffer_float"));
-    // http://anglebug.com/4092
-    ANGLE_SKIP_TEST_IF(IsVulkan());
    auto testOutput = [this](GLuint texture, const GLColor32F &expectedColor) {
        constexpr char kVS[] =