Vulkan: Set missing geometry/tessellation limits

Bug: angleproject:5557 Bug: angleproject:5579 Change-Id: Idb8ebc0c3beee8f273d0df3b4e0d84722a8590b2 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2653912 Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Tim Van Patten <timvp@google.com>

Vulkan: Set missing geometry/tessellation limits
61f60161 · Shahbaz Youssefi · Commit Bot · c6a8bc4a · 61f60161
Commit 61f60161 authored Jan 27, 2021 by Shahbaz Youssefi Committed by Commit Bot Jan 30, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 5 deletions

vk_caps_utils.cpp src/libANGLE/renderer/vulkan/vk_caps_utils.cpp +18 -5

No files found.
--- a/src/libANGLE/renderer/vulkan/vk_caps_utils.cpp
+++ b/src/libANGLE/renderer/vulkan/vk_caps_utils.cpp
@@ -754,13 +754,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);
-
-    mNativeCaps.maxShaderImageUniforms[gl::ShaderType::Vertex] =
+    const int32_t maxVertexPipelineImages =
        mPhysicalDeviceFeatures.vertexPipelineStoresAndAtomics ? maxPerStageImages : 0;
+
+    mNativeCaps.maxShaderImageUniforms[gl::ShaderType::Vertex]         = maxVertexPipelineImages;
+    mNativeCaps.maxShaderImageUniforms[gl::ShaderType::TessControl]    = maxVertexPipelineImages;
+    mNativeCaps.maxShaderImageUniforms[gl::ShaderType::TessEvaluation] = maxVertexPipelineImages;
+    mNativeCaps.maxShaderImageUniforms[gl::ShaderType::Geometry]       = maxVertexPipelineImages;
    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;
@@ -928,7 +930,8 @@ void RendererVk::ensureCapsInitialized() const

        // TODO: tessellation shader support is incomplete.  http://anglebug.com/3572
        mNativeExtensions.tessellationShaderEXT =
-            getFeatures().exposeNonConformantExtensionsAndVersions.enabled;
+            mFeatures.supportsTransformFeedbackExtension.enabled &&
+            mFeatures.exposeNonConformantExtensionsAndVersions.enabled;
        mNativeCaps.maxPatchVertices = LimitToInt(limitsVk.maxTessellationPatchSize);
        mNativeCaps.maxTessPatchComponents =
            LimitToInt(limitsVk.maxTessellationControlPerPatchOutputComponents);
@@ -950,6 +953,16 @@ void RendererVk::ensureCapsInitialized() const
            mNativeCaps.maxCombinedUniformBlocks + kReservedTessellationDefaultUniformBindingCount);
        mNativeCaps.maxUniformBufferBindings = LimitToInt(
            mNativeCaps.maxUniformBufferBindings + kReservedTessellationDefaultUniformBindingCount);
+
+        mNativeCaps.maxShaderStorageBlocks[gl::ShaderType::TessControl] =
+            mNativeCaps.maxCombinedShaderOutputResources;
+        mNativeCaps.maxShaderAtomicCounterBuffers[gl::ShaderType::TessControl] =
+            maxCombinedAtomicCounterBuffers;
+
+        mNativeCaps.maxShaderStorageBlocks[gl::ShaderType::TessEvaluation] =
+            mNativeCaps.maxCombinedShaderOutputResources;
+        mNativeCaps.maxShaderAtomicCounterBuffers[gl::ShaderType::TessEvaluation] =
+            maxCombinedAtomicCounterBuffers;
    }

    // GL_APPLE_clip_distance/GL_EXT_clip_cull_distance