Vulkan: Handle overflow in maxCombinedUniformComponents computation

Certain vendors support large number of uniform buffer components. The calculation of maxCombinedUniformComponents overflows when captured in a 32bit lvalue. Update it to a 64bit variable. Bug: angleproject:4788 Tests: dEQP-GLES3.functional.state_query.integers64.max_combined* Change-Id: I355910218c56347c98a5dfa7359b00be7b40871a Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2264849 Commit-Queue: Mohan Maiya <m.maiya@samsung.com> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Vulkan: Handle overflow in maxCombinedUniformComponents computation
5474304a · Mohan Maiya · Commit Bot · ea706304 · 5474304a
Commit 5474304a authored Jun 24, 2020 by Mohan Maiya Committed by Commit Bot Jun 25, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

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

No files found.
--- a/src/libANGLE/renderer/vulkan/vk_caps_utils.cpp
+++ b/src/libANGLE/renderer/vulkan/vk_caps_utils.cpp
@@ -446,8 +446,9 @@ void RendererVk::ensureCapsInitialized() const
    // There is no additional limit to the combined number of components.  We can have up to a
    // maximum number of uniform buffers, each having the maximum number of components.  Note that
    // this limit includes both components in and out of uniform buffers.
-    const uint32_t maxCombinedUniformComponents =
+    const uint64_t maxCombinedUniformComponents =
-        (maxPerStageUniformBuffers + kReservedPerStageDefaultUniformBindingCount) *
+        static_cast<uint64_t>(maxPerStageUniformBuffers +
+                              kReservedPerStageDefaultUniformBindingCount) *
        maxUniformComponents;
    for (gl::ShaderType shaderType : gl::AllShaderTypes())
    {