Vulkan: add feature control for client buffer merge

add feature control for client attribute buffer merge. default is off to reduce memeory usage for some application. Bug: b/328301788 Change-Id: I5bfd39fb1ea656ebb29bd2dc21726b60bbc1a8d2 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5410942 Commit-Queue: Hailin Zhang <[email protected]> Reviewed-by: Charlie Lao <[email protected]> Reviewed-by: Amirali Abdolrashidi <[email protected]>
google · Apr 3, 2024 · dc643d9 · dc643d9
1 parent ceb3c0e
commit dc643d9
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 0 deletions.
diff --git a/include/platform/autogen/FeaturesVk_autogen.h b/include/platform/autogen/FeaturesVk_autogen.h
@@ -1352,6 +1352,13 @@ struct FeaturesVk : FeatureSetBase
         &members, "https://issuetracker.google.com/328837151"
     };
 
+    FeatureInfo enableMergeClientAttribBuffer = {
+        "enableMergeClientAttribBuffer",
+        FeatureCategory::VulkanFeatures,
+        "Enable merge for client attrib buffer if possible",
+        &members, "https://issuetracker.google.com/328301788"
+    };
+
 };
 
 inline FeaturesVk::FeaturesVk()  = default;

diff --git a/include/platform/vk_features.json b/include/platform/vk_features.json
@@ -1472,6 +1472,14 @@
                 "enable additional blend factors for dithering"
             ],
             "issue": "https://issuetracker.google.com/328837151"
+        },
+        {
+            "name": "enable_merge_client_attrib_buffer",
+            "category": "Features",
+            "description": [
+                "Enable merge for client attrib buffer if possible"
+            ],
+            "issue": "https://issuetracker.google.com/328301788"
         }
     ]
 }
diff --git a/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp b/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
@@ -59,6 +59,10 @@ bool ShouldCombineAttributes(vk::Renderer *renderer,
                              const gl::VertexAttribute &attrib,
                              const gl::VertexBinding &binding)
 {
+    if (!renderer->getFeatures().enableMergeClientAttribBuffer.enabled)
+    {
+        return false;
+    }
     const vk::Format &vertexFormat = renderer->getFormat(attrib.format->id);
     return !vertexFormat.getVertexLoadRequiresConversion(false) && binding.getDivisor() == 0 &&
            ClientBindingAligned(attrib, binding.getStride(),

diff --git a/util/autogen/angle_features_autogen.cpp b/util/autogen/angle_features_autogen.cpp
@@ -139,6 +139,7 @@ constexpr PackedEnumMap<Feature, const char *> kFeatureNames = {{
     {Feature::EnableAsyncPipelineCacheCompression, "enableAsyncPipelineCacheCompression"},
     {Feature::EnableCaptureLimits, "enableCaptureLimits"},
     {Feature::EnableInMemoryMtlLibraryCache, "enableInMemoryMtlLibraryCache"},
+    {Feature::EnableMergeClientAttribBuffer, "enableMergeClientAttribBuffer"},
     {Feature::EnableMultisampledRenderToTexture, "enableMultisampledRenderToTexture"},
     {Feature::EnableParallelCompileAndLink, "enableParallelCompileAndLink"},
     {Feature::EnableParallelMtlLibraryCompilation, "enableParallelMtlLibraryCompilation"},

diff --git a/util/autogen/angle_features_autogen.h b/util/autogen/angle_features_autogen.h
@@ -139,6 +139,7 @@ enum class Feature
     EnableAsyncPipelineCacheCompression,
     EnableCaptureLimits,
     EnableInMemoryMtlLibraryCache,
+    EnableMergeClientAttribBuffer,
     EnableMultisampledRenderToTexture,
     EnableParallelCompileAndLink,
     EnableParallelMtlLibraryCompilation,