Increase MAX_UNIFORM_BUFFER_BINDINGS to 72

src/libANGLE/Constants.h

@@ -41,7 +41,9 @@ enum
     IMPLEMENTATION_MAX_COMBINED_SHADER_UNIFORM_BUFFERS = 36,
 
     // GL_EXT_geometry_shader increases the minimum value of GL_MAX_UNIFORM_BUFFER_BINDINGS to 48.
-    IMPLEMENTATION_MAX_UNIFORM_BUFFER_BINDINGS = 48,
+    // Vulkan's minimum value for maxDescriptorSetUniformBuffers is 72 so allow exposing up to that
+    // many.
+    IMPLEMENTATION_MAX_UNIFORM_BUFFER_BINDINGS = 72,
 
     // Transform feedback limits set to the minimum required by the spec.
     IMPLEMENTATION_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS = 128,

src/libANGLE/renderer/vulkan/ProgramExecutableVk.cpp

@@ -987,11 +987,6 @@ angle::Result ProgramExecutableVk::updateBuffersDescriptorSet(
            descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER);
     const bool isStorageBuffer = descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER;
 
-    static_assert(
-        gl::IMPLEMENTATION_MAX_SHADER_STORAGE_BUFFER_BINDINGS >=
-            gl::IMPLEMENTATION_MAX_UNIFORM_BUFFER_BINDINGS,
-        "The descriptor arrays here would have inadequate size for uniform buffer objects");
-
     VkDescriptorSet descriptorSet =
         mDescriptorSets[ToUnderlying(DescriptorSetIndex::ShaderResource)];