gpu2: fix descriptor sets count

RPCSX · Sep 26, 2024 · e863704 · e863704
1 parent b53d59a
commit e863704
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 19 deletions.
diff --git a/rpcsx-gpu2/Cache.cpp b/rpcsx-gpu2/Cache.cpp
@@ -690,9 +690,9 @@ Cache::Image Cache::Tag::getImage(const ImageKey &key, Access access) {
       key.pitch, key.baseArrayLayer, key.arrayLayerCount, key.baseMipLevel,
       key.mipCount, key.pow2pad);
 
-  VkImageUsageFlags usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT |
-              VK_IMAGE_USAGE_TRANSFER_SRC_BIT |
-              VK_IMAGE_USAGE_SAMPLED_BIT // | VK_IMAGE_USAGE_STORAGE_BIT
+  VkImageUsageFlags usage =
+      VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT |
+      VK_IMAGE_USAGE_SAMPLED_BIT // | VK_IMAGE_USAGE_STORAGE_BIT
       ;
 
   bool isCompressed =
@@ -1009,29 +1009,31 @@ Cache::createGraphicsDescriptorSets() {
     return result;
   }
 
+  constexpr auto maxSets = Cache::kGraphicsStages.size() * 128;
+
   if (mGraphicsDescriptorPool == nullptr) {
     VkDescriptorPoolSize poolSizes[]{
         {
             .type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
-            .descriptorCount = 1,
+            .descriptorCount = 1 * (maxSets / 4),
         },
         {
             .type = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE,
-            .descriptorCount = 16 * 3,
+            .descriptorCount = 16 * (maxSets / 4),
         },
         {
             .type = VK_DESCRIPTOR_TYPE_SAMPLER,
-            .descriptorCount = 16,
+            .descriptorCount = 16 * (maxSets / 4),
         },
         {
             .type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE,
-            .descriptorCount = 16,
+            .descriptorCount = 16 * (maxSets / 4),
         },
     };
 
     VkDescriptorPoolCreateInfo info{
         .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO,
-        .maxSets = Cache::kGraphicsStages.size() * 100,
+        .maxSets = maxSets,
         .poolSizeCount = static_cast<uint32_t>(std::size(poolSizes)),
         .pPoolSizes = poolSizes,
     };
@@ -1064,29 +1066,31 @@ VkDescriptorSet Cache::createComputeDescriptorSet() {
     return result;
   }
 
+  constexpr auto maxSets = 128;
+
   if (mComputeDescriptorPool == nullptr) {
     VkDescriptorPoolSize poolSizes[]{
         {
             .type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
-            .descriptorCount = 1,
+            .descriptorCount = 1 * (maxSets / 4),
         },
         {
             .type = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE,
-            .descriptorCount = 16 * 3,
+            .descriptorCount = 16 * (maxSets / 4),
         },
         {
             .type = VK_DESCRIPTOR_TYPE_SAMPLER,
-            .descriptorCount = 16,
+            .descriptorCount = 16 * (maxSets / 4),
         },
         {
             .type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE,
-            .descriptorCount = 16,
+            .descriptorCount = 16 * (maxSets / 4),
         },
     };
 
     VkDescriptorPoolCreateInfo info{
         .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO,
-        .maxSets = 8,
+        .maxSets = maxSets,
         .poolSizeCount = static_cast<uint32_t>(std::size(poolSizes)),
         .pPoolSizes = poolSizes,
     };

diff --git a/rpcsx-gpu2/Renderer.cpp b/rpcsx-gpu2/Renderer.cpp
@@ -639,9 +639,6 @@ void amdgpu::draw(GraphicsPipe &pipe, int vmId, std::uint32_t firstVertex,
         .supportsBarycentric = vk::context->supportsBarycentric,
         .supportsInt8 = vk::context->supportsInt8,
         .supportsInt64Atomics = vk::context->supportsInt64Atomics,
-        // .supportsBarycentric = false,
-        // .supportsInt8 = false,
-        // .supportsInt64Atomics = false,
     };
 
     auto shader = cacheTag.getShader({

diff --git a/rpcsx-gpu2/lib/amdgpu-tiler/src/tiler_vulkan.cpp b/rpcsx-gpu2/lib/amdgpu-tiler/src/tiler_vulkan.cpp
@@ -74,7 +74,7 @@ struct TilerShader {
 struct amdgpu::GpuTiler::Impl {
   TilerDecriptorSetLayout descriptorSetLayout;
   std::mutex descriptorMtx;
-  VkDescriptorSet descriptorSets[4]{};
+  VkDescriptorSet descriptorSets[32]{};
   VkDescriptorPool descriptorPool;
   std::uint32_t inUseDescriptorSets = 0;
 
@@ -119,12 +119,12 @@ struct amdgpu::GpuTiler::Impl {
     {
       VkDescriptorPoolSize poolSizes[]{{
           .type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
-          .descriptorCount = 1,
+          .descriptorCount = static_cast<std::uint32_t>(std::size(descriptorSets)) * 2,
       }};
 
       VkDescriptorPoolCreateInfo info{
           .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO,
-          .maxSets = static_cast<std::uint32_t>(std::size(descriptorSets)) * 4,
+          .maxSets = static_cast<std::uint32_t>(std::size(descriptorSets)) * 2,
           .poolSizeCount = static_cast<uint32_t>(std::size(poolSizes)),
           .pPoolSizes = poolSizes,
       };