Allow GL_OES_shader_image_atomic when non-conformant

On Android, force allowing it with: adb shell setprop debug.angle.feature_overrides_enabled \ exposeNonConformantExtensionsAndVersions If enabling multiple features, switch to using settings which don't have a character limit, but persist across reboots: adb shell settings put global angle_egl_features \ exposeNonConformantExtensionsAndVersions:foo:bar Test: Fortnite on ANGLE Bug: b/170755560 Bug: angleproject:5503 Change-Id: I58e3b265daa8ea1f645f47e0971c4454b8ddb3f2 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2570775 Commit-Queue: Cody Northrop <cnorthrop@google.com> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>

Allow GL_OES_shader_image_atomic when non-conformant
d38b9f86 · Cody Northrop · Commit Bot · fb4eea2e · d38b9f86 · d38b9f86
Commit d38b9f86 authored Dec 02, 2020 by Cody Northrop Committed by Commit Bot Jan 12, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

vk_caps_utils.cpp src/libANGLE/renderer/vulkan/vk_caps_utils.cpp +2 -1

deqp_gles31_test_expectations.txt src/tests/deqp_support/deqp_gles31_test_expectations.txt +4 -0

No files found.
--- a/src/libANGLE/renderer/vulkan/vk_caps_utils.cpp
+++ b/src/libANGLE/renderer/vulkan/vk_caps_utils.cpp
@@ -912,7 +912,8 @@ void RendererVk::ensureCapsInitialized() const
    // imageAtomicExchange supports r32f.  Exposing this extension is thus restricted to this format
    // having support for the aforementioned features.
    mNativeExtensions.shaderImageAtomicOES =
-        vk::HasShaderImageAtomicsSupport(this, mNativeExtensions);
+        vk::HasShaderImageAtomicsSupport(this, mNativeExtensions) ||
+        getFeatures().exposeNonConformantExtensionsAndVersions.enabled;

    // Geometry shader is optional.
    if (mPhysicalDeviceFeatures.geometryShader)

--- a/src/tests/deqp_support/deqp_gles31_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_gles31_test_expectations.txt
@@ -343,3 +343,7 @@
 3588 VULKAN ANDROID : dEQP-GLES31.functional.shaders.sample_variables.sample_pos.correctness.multisample_*_1 = FAIL
 3588 VULKAN ANDROID : dEQP-GLES31.functional.shaders.sample_variables.sample_pos.correctness.multisample_*_2 = FAIL
 3588 VULKAN ANDROID : dEQP-GLES31.functional.shaders.sample_variables.sample_pos.correctness.multisample_*_4 = FAIL
+
+// When ANGLE allows non-conformant features, imageAtomicExchange with r32f fails
+5503 VULKAN ANDROID : dEQP-GLES31.functional.image_load_store.*.atomic.exchange_r32f* = FAIL
+5503 SWIFTSHADER : dEQP-GLES31.functional.image_load_store.*.atomic.exchange_r32f* = SKIP