Vulkan: Apply driver uniforms descriptor set.

src/libANGLE/renderer/vulkan/ContextVk.cpp

@@ -236,11 +236,10 @@ gl::Error ContextVk::setupDraw(const gl::Context *context,
     // TODO(jmadill): Handle multiple command buffers.
     const auto &descriptorSets   = programVk->getDescriptorSets();
     const gl::RangeUI &usedRange = programVk->getUsedDescriptorSetRange();
+    const vk::PipelineLayout &pipelineLayout = programVk->getPipelineLayout();
     if (!usedRange.empty())
     {
         ASSERT(!descriptorSets.empty());
-        const vk::PipelineLayout &pipelineLayout = programVk->getPipelineLayout();
-
         (*commandBufferOut)
             ->bindDescriptorSets(VK_PIPELINE_BIND_POINT_GRAPHICS, pipelineLayout, usedRange.low(),
                                  usedRange.length(), &descriptorSets[usedRange.low()],
@@ -248,6 +247,11 @@ gl::Error ContextVk::setupDraw(const gl::Context *context,
                                  programVk->getDynamicOffsets());
     }
 
+    (*commandBufferOut)
+        ->bindDescriptorSets(VK_PIPELINE_BIND_POINT_GRAPHICS, pipelineLayout,
+                             kDriverUniformsDescriptorSetIndex, 1, &mDriverUniformsDescriptorSet, 0,
+                             nullptr);
+
     return gl::NoError();
 }
 

src/libANGLE/renderer/vulkan/ProgramVk.cpp

@@ -302,9 +302,16 @@ gl::LinkResult ProgramVk::link(const gl::Context *glContext,
     ANGLE_TRY(renderer->getDescriptorSetLayout(texturesSetDesc,
                                                &mDescriptorSetLayouts[kTextureDescriptorSetIndex]));
 
+    vk::DescriptorSetLayoutDesc driverUniformsSetDesc;
+    driverUniformsSetDesc.update(0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1);
+    ANGLE_TRY(renderer->getDescriptorSetLayout(
+        driverUniformsSetDesc, &mDescriptorSetLayouts[kDriverUniformsDescriptorSetIndex]));
+
     vk::PipelineLayoutDesc pipelineLayoutDesc;
     pipelineLayoutDesc.updateDescriptorSetLayout(kUniformsDescriptorSetIndex, uniformsSetDesc);
     pipelineLayoutDesc.updateDescriptorSetLayout(kTextureDescriptorSetIndex, texturesSetDesc);
+    pipelineLayoutDesc.updateDescriptorSetLayout(kDriverUniformsDescriptorSetIndex,
+                                                 driverUniformsSetDesc);
 
     ANGLE_TRY(
         renderer->getPipelineLayout(pipelineLayoutDesc, mDescriptorSetLayouts, &mPipelineLayout));