Vulkan: PPO: Allocate uniform descriptor set if list is empty

When a Program is used to draw, the buffers to hold uniforms are allocated as part of updateUniforms(), and then if a buffer is allocated, a corresponding descriptor set is allocated for each shader stage with uniforms. However, if that Program is later bound to a PPO, the PPO's descriptor set list is cleared as part of creating the pipeline layout. This means the uniform descriptor sets need to be re-allocated but using the previously allocated buffers so the 'anyNewBufferAllocated' flag isn't enough - we also need to check if the PPO's list of descriptor sets is empty. Bug: angleproject:3570 Test: KHR-GLES31.core.sepshaderobjs.StateInteraction Change-Id: Id8df587b4f5552012590a29d120b6899bbdf677b Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2156936Reviewed-by: Courtney Goeltzenleuchter <courtneygo@google.com> Reviewed-by: Charlie Lao <cclao@google.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Tim Van Patten <timvp@google.com>

Vulkan: PPO: Allocate uniform descriptor set if list is empty
0e1798d6 · Tim Van Patten · Commit Bot · dadd1986 · 0e1798d6
Commit 0e1798d6 authored Apr 20, 2020 by Tim Van Patten Committed by Commit Bot Apr 22, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

ProgramPipelineVk.cpp src/libANGLE/renderer/vulkan/ProgramPipelineVk.cpp +4 -1

No files found.
--- a/src/libANGLE/renderer/vulkan/ProgramPipelineVk.cpp
+++ b/src/libANGLE/renderer/vulkan/ProgramPipelineVk.cpp
@@ -140,7 +140,10 @@ angle::Result ProgramPipelineVk::updateUniforms(ContextVk *contextVk)
        ++offsetIndex;
    }
-    if (anyNewBufferAllocated)
+    // The PPO's list of descriptor sets being empty without a new buffer being allocated indicates
+    // a Program that was already used in a draw command (and thus already allocated uniform
+    // buffers) has been bound to this PPO.
+    if (anyNewBufferAllocated || mExecutable.mDescriptorSets.empty())
    {
        // We need to reinitialize the descriptor sets if we newly allocated buffers since we can't
        // modify the descriptor sets once initialized.