Skip to content

A
angle
Commit a57c1fb6 by Xinyi He Committed by Commit Bot
Options

Vulkan: Large builtins overflow during string construction in glslang

It is fixed in the glslang that the string size expands to 200, so remove the workaround in the commit 4c7db77e. Bug: angleproject:4120 Change-Id: Iacc17259a68b3c92763c309a61b7fd87b130edc6 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1936074 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarIan Elliott <ianelliott@google.com>
parent 4cef8a49
Showing with 6 additions and 11 deletions
src/libANGLE/renderer/vulkan/vk_caps_utils.cpp
......@@ -199,17 +199,12 @@ void RendererVk::ensureCapsInitialized() const
mNativeCaps.fragmentLowpInt.setTwosComplementInt(32);
// Compute shader limits.
// Clamp the maxComputeWorkGroupCount[] to 1,000,000.
// It's a workaround for http://anglebug.com/4120 and http://anglebug.com/4066
mNativeCaps.maxComputeWorkGroupCount[0] =
std::min(LimitToInt(limitsVk.maxComputeWorkGroupCount[0]), 1000000);
mNativeCaps.maxComputeWorkGroupCount[1] =
std::min(LimitToInt(limitsVk.maxComputeWorkGroupCount[1]), 1000000);
mNativeCaps.maxComputeWorkGroupCount[2] =
std::min(LimitToInt(limitsVk.maxComputeWorkGroupCount[2]), 1000000);
mNativeCaps.maxComputeWorkGroupSize[0] = LimitToInt(limitsVk.maxComputeWorkGroupSize[0]);
mNativeCaps.maxComputeWorkGroupSize[1] = LimitToInt(limitsVk.maxComputeWorkGroupSize[1]);
mNativeCaps.maxComputeWorkGroupSize[2] = LimitToInt(limitsVk.maxComputeWorkGroupSize[2]);
mNativeCaps.maxComputeWorkGroupCount[0] = LimitToInt(limitsVk.maxComputeWorkGroupCount[0]);
mNativeCaps.maxComputeWorkGroupCount[1] = LimitToInt(limitsVk.maxComputeWorkGroupCount[1]);
mNativeCaps.maxComputeWorkGroupCount[2] = LimitToInt(limitsVk.maxComputeWorkGroupCount[2]);
mNativeCaps.maxComputeWorkGroupSize[0] = LimitToInt(limitsVk.maxComputeWorkGroupSize[0]);
mNativeCaps.maxComputeWorkGroupSize[1] = LimitToInt(limitsVk.maxComputeWorkGroupSize[1]);
mNativeCaps.maxComputeWorkGroupSize[2] = LimitToInt(limitsVk.maxComputeWorkGroupSize[2]);
mNativeCaps.maxComputeWorkGroupInvocations =
LimitToInt(limitsVk.maxComputeWorkGroupInvocations);
mNativeCaps.maxComputeSharedMemorySize = LimitToInt(limitsVk.maxComputeSharedMemorySize);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment