Vulkan: Enable forceOldRewriteStructSamplers for all Android ICDs

Both Qualcomm and SwS require forceOldRewriteStructSamplers to be enabled, so this change will enable that feature for all of Android. We aren't sure yet why this is required for SwS also, but that will be chased as part of issue 2703. Bug: angleproject:4045 Change-Id: I83b2ac18e0111ed35438ffd457bfe120911a7767 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1879711 Commit-Queue: Courtney Goeltzenleuchter <courtneygo@google.com> Reviewed-by: Courtney Goeltzenleuchter <courtneygo@google.com> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Vulkan: Enable forceOldRewriteStructSamplers for all Android ICDs
287b0a67 · Tim Van Patten · Commit Bot · dc883a94 · 287b0a67 · 287b0a67
Commit 287b0a67 authored Oct 24, 2019 by Tim Van Patten Committed by Commit Bot Oct 29, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

FeaturesVk.h include/platform/FeaturesVk.h +1 -1

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

No files found.
--- a/include/platform/FeaturesVk.h
+++ b/include/platform/FeaturesVk.h
@@ -192,7 +192,7 @@ struct FeaturesVk : FeatureSetBase
        "Seamful cube map emulation misbehaves on some drivers, so it's disallowed", &members,
        "http://anglebug.com/3243"};

-    // Qualcomm shader compiler doesn't support sampler arrays as parameters, so
+    // Qualcomm and SwiftShader shader compiler doesn't support sampler arrays as parameters, so
    // revert to old RewriteStructSamplers behavior, which produces fewer.
    Feature forceOldRewriteStructSamplers = {
        "force_old_rewrite_struct_samplers", FeatureCategory::VulkanWorkarounds,

--- a/src/libANGLE/renderer/vulkan/RendererVk.cpp
+++ b/src/libANGLE/renderer/vulkan/RendererVk.cpp
@@ -1367,7 +1367,7 @@ void RendererVk::initFeatures(const ExtensionNameList &deviceExtensionNames)
    ANGLE_FEATURE_CONDITION((&mFeatures), bindEmptyForUnusedDescriptorSets,
                            IsAndroid() && isQualcomm);

-    ANGLE_FEATURE_CONDITION((&mFeatures), forceOldRewriteStructSamplers, IsAndroid() && isQualcomm);
+    ANGLE_FEATURE_CONDITION((&mFeatures), forceOldRewriteStructSamplers, IsAndroid());

    ANGLE_FEATURE_CONDITION((&mFeatures), perFrameWindowSizeQuery,
                            isIntel || (IsWindows() && isAMD));