Disable forceOldRewriteStructSamplers on Mali.

The nested_array.*sampler2D_* tests can pass on Mali with disabled forceOldRewriteStructSamplers. Test: dEQP-GLES31.functional.uniform_location.nested_array.*sampler2D_* Bug: angleproject:2703 Change-Id: I34368d6ce14b81e873e2a3d60a73da4a8a866884 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2377627 Commit-Queue: Amy Liu <Amy.Liu@arm.com> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Disable forceOldRewriteStructSamplers on Mali.
7bb75ff6 · Amy Liu · Commit Bot · 28259677 · 7bb75ff6
Commit 7bb75ff6 authored Aug 26, 2020 by Amy Liu Committed by Commit Bot Aug 27, 2020
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

RendererVk.cpp src/libANGLE/renderer/vulkan/RendererVk.cpp +3 -2

No files found.
--- a/src/libANGLE/renderer/vulkan/RendererVk.cpp
+++ b/src/libANGLE/renderer/vulkan/RendererVk.cpp
@@ -1776,8 +1776,9 @@ void RendererVk::initFeatures(DisplayVk *displayVk, const ExtensionNameList &dev
    ANGLE_FEATURE_CONDITION(&mFeatures, bindEmptyForUnusedDescriptorSets,
                            IsAndroid() && isQualcomm);
-    ANGLE_FEATURE_CONDITION(&mFeatures, forceOldRewriteStructSamplers,
+    ANGLE_FEATURE_CONDITION(
-                            IsAndroid() && !isSwiftShader);
+        &mFeatures, forceOldRewriteStructSamplers,
+        !mPhysicalDeviceFeatures.shaderSampledImageArrayDynamicIndexing || isQualcomm);
    ANGLE_FEATURE_CONDITION(&mFeatures, perFrameWindowSizeQuery,
                            isIntel || (IsWindows() && isAMD) || IsFuchsia() || isARM);