Vulkan: Add support for GL_RGBA8-to-GL_RGB5_A1

This support was missing and caused dEQP crashes. Bug: angleproject:3627 Change-Id: Idc06cc92df676061f8a08d0f32a1b3e7f03a66f4 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1691102 Commit-Queue: Ian Elliott <ianelliott@google.com> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>

Vulkan: Add support for GL_RGBA8-to-GL_RGB5_A1
5e1b3777 · Ian Elliott · Commit Bot · 934fc44f · 5e1b3777 · 5e1b3777
Commit 5e1b3777 authored Jul 08, 2019 by Ian Elliott Committed by Commit Bot Jul 09, 2019
5 changed files
--- a/scripts/run_code_generation_hashes.json
+++ b/scripts/run_code_generation_hashes.json
@@ -14,9 +14,9 @@
  "ANGLE load functions table:src/libANGLE/renderer/gen_load_functions_table.py":
    "e65c50e84fc38ad34d0eb0bebb84aab6",
  "ANGLE load functions table:src/libANGLE/renderer/load_functions_data.json":
-    "816be111bf4d1995589350dceb367315",
+    "4b8a2d1b1f7038e04f51b587f0e98231",
  "ANGLE load functions table:src/libANGLE/renderer/load_functions_table_autogen.cpp":
-    "e6d34c18d41d3a9259f6a3e3ff6e40ff",
+    "5bfde353048f843718b296c5b32faf73",
  "D3D11 blit shader selection:src/libANGLE/renderer/d3d/d3d11/Blit11Helper_autogen.inc":
    "f69cf03a3d868a977fad9e9c0eb0652a",
  "D3D11 blit shader selection:src/libANGLE/renderer/d3d/d3d11/d3d11_blit_shaders_autogen.gni":

--- a/src/libANGLE/renderer/load_functions_data.json
+++ b/src/libANGLE/renderer/load_functions_data.json
@@ -142,7 +142,8 @@
  },
  "GL_RGB5_A1": {
    "A1R5G5B5_UNORM": {
-      "GL_UNSIGNED_SHORT_5_5_5_1": "LoadRGB5A1ToA1RGB5"
+      "GL_UNSIGNED_SHORT_5_5_5_1": "LoadRGB5A1ToA1RGB5",
+      "GL_UNSIGNED_BYTE": "LoadRGBA8ToBGR5A1"
    },
    "R8G8B8A8_UNORM": {
      "GL_UNSIGNED_INT_2_10_10_10_REV": "LoadRGB10A2ToRGBA8",

--- a/src/libANGLE/renderer/load_functions_table_autogen.cpp
+++ b/src/libANGLE/renderer/load_functions_table_autogen.cpp
@@ -2162,6 +2162,8 @@ LoadImageFunctionInfo RGB5_A1_to_A1R5G5B5_UNORM(GLenum type)
 {
    switch (type)
    {
+        case GL_UNSIGNED_BYTE:
+            return LoadImageFunctionInfo(LoadRGBA8ToBGR5A1, true);
        case GL_UNSIGNED_SHORT_5_5_5_1:
            return LoadImageFunctionInfo(LoadRGB5A1ToA1RGB5, true);
        default:

--- a/src/tests/deqp_support/deqp_khr_gles31_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_khr_gles31_test_expectations.txt
@@ -81,7 +81,6 @@
 3520 VULKAN : KHR-GLES31.core.vertex_attrib_binding* = SKIP
 3520 VULKAN : KHR-GLES31.core.internalformat.texture2d.* = FAIL
-3520 VULKAN : KHR-GLES31.core.internalformat.texture2d.*rgb5* = SKIP
 // SSBO:
 3561 VULKAN : KHR-GLES31.core.shader_storage_buffer_object.* = SKIP
@@ -102,7 +101,6 @@
 3586 VULKAN : KHR-GLES31.core.blend_equation_advanced.* = SKIP
 3520 VULKAN : KHR-GLES31.core.internalformat.copy_tex_image* = FAIL
-3520 VULKAN : KHR-GLES31.core.internalformat.copy_tex_image*rgb5* = SKIP
 3520 VULKAN : KHR-GLES31.core.internalformat.renderbuffer* = FAIL
 3520 VULKAN : KHR-GLES31.shaders.aggressive_optimizations* = FAIL

--- a/src/tests/deqp_support/deqp_khr_gles3_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_khr_gles3_test_expectations.txt
@@ -41,10 +41,6 @@
 3455 VULKAN : KHR-GLES3.packed_pixels.pbo_rectangle.r* = SKIP
 3455 VULKAN : KHR-GLES3.packed_pixels.pbo_rectangle.srgb8_alpha8 = SKIP
-// Failures related to RGB5A1 texture formats.
-3456 VULKAN : KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_byte_rgb5_a1 = SKIP
-3456 VULKAN : KHR-GLES3.core.internalformat.copy_tex_image.rgb5_a1 = SKIP
 // Depth/stencil related failures.
 3457 VULKAN : KHR-GLES3.core.internalformat.texture2d.depth_stencil_unsigned_int_24_8_depth24_stencil8 = FAIL
 3457 VULKAN : KHR-GLES3.packed_pixels.rectangle.depth* = SKIP