Vulkan: Set maxShaderImageUniforms zero on some Mali GPUs

Some Mali GPUs don't support vertexPipelineStoresAndAtomics feature, so the maxShaderImageUniforms should be set zero. Bug: angleproject:4629 Change-Id: I754506dd27c75b3dfd5ab695e24a680f683ca78a Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2195424 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Vulkan: Set maxShaderImageUniforms zero on some Mali GPUs
e7b9118b · Xinyi He · Commit Bot · 3d598abb · e7b9118b
Commit e7b9118b authored May 11, 2020 by Xinyi He Committed by Commit Bot May 12, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 4 deletions

vk_caps_utils.cpp src/libANGLE/renderer/vulkan/vk_caps_utils.cpp +9 -4

No files found.
--- a/src/libANGLE/renderer/vulkan/vk_caps_utils.cpp
+++ b/src/libANGLE/renderer/vulkan/vk_caps_utils.cpp
@@ -425,10 +425,15 @@ void RendererVk::ensureCapsInitialized() const
    // GL Images correspond to Vulkan Storage Images.
    const int32_t maxPerStageImages = LimitToInt(limitsVk.maxPerStageDescriptorStorageImages);
    const int32_t maxCombinedImages = LimitToInt(limitsVk.maxDescriptorSetStorageImages);
-    for (gl::ShaderType shaderType : gl::AllShaderTypes())
-    {
+    mNativeCaps.maxShaderImageUniforms[gl::ShaderType::Vertex] =
-        mNativeCaps.maxShaderImageUniforms[shaderType] = maxPerStageImages;
+        mPhysicalDeviceFeatures.vertexPipelineStoresAndAtomics ? maxPerStageImages : 0;
-    }
+    mNativeCaps.maxShaderImageUniforms[gl::ShaderType::Fragment] =
+        mPhysicalDeviceFeatures.fragmentStoresAndAtomics ? maxPerStageImages : 0;
+    mNativeCaps.maxShaderImageUniforms[gl::ShaderType::Geometry] =
+        mPhysicalDeviceFeatures.vertexPipelineStoresAndAtomics ? maxPerStageImages : 0;
+    mNativeCaps.maxShaderImageUniforms[gl::ShaderType::Compute] = maxPerStageImages;
    mNativeCaps.maxCombinedImageUniforms = maxCombinedImages;
    mNativeCaps.maxImageUnits            = maxCombinedImages;