RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-01-20 23:50:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

gpu2: fix descriptor sets count

Browse source
This commit is contained in:
DH 2024-09-26 17:47:19 +03:00
parent b53d59aa1f
commit f1881113ff
3 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
rpcsx-gpu2/Cache.cpp
View file

@ -103,7 +103,7 @@ static VkShaderStageFlagBits shaderStageToVk(shader::gcn::Stage stage) {
}
static void fillStageBindings(VkDescriptorSetLayoutBinding *bindings,
VkShaderStageFlagBits stage, int setIndex) {
VkShaderStageFlagBits stage, int setIndex, std::uint32_t setCount) {
auto createDescriptorBinding = [&](VkDescriptorType type, uint32_t count,
int dim = 0) {
@ -112,7 +112,7 @@ static void fillStageBindings(VkDescriptorSetLayoutBinding *bindings,
bindings[binding] = VkDescriptorSetLayoutBinding{
.binding = static_cast<std::uint32_t>(binding),
.descriptorType = type,
.descriptorCount = count,
.descriptorCount = count * setCount,
.stageFlags = VkShaderStageFlags(
stage | (binding > 0 && stage != VK_SHADER_STAGE_COMPUTE_BIT
? VK_SHADER_STAGE_ALL_GRAPHICS
@ -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 =
@ -875,7 +875,7 @@ Cache::Cache(Device *device, int vmId) : mDevice(device), mVmIm(vmId) {
[kDescriptorBindings.size()];
for (std::size_t index = 0; auto stage : kGraphicsStages) {
fillStageBindings(bindings[index], stage, index);
fillStageBindings(bindings[index], stage, index, 128);
++index;
}
@ -898,7 +898,7 @@ Cache::Cache(Device *device, int vmId) : mDevice(device), mVmIm(vmId) {
{
VkDescriptorSetLayoutBinding bindings[kDescriptorBindings.size()];
fillStageBindings(bindings, VK_SHADER_STAGE_COMPUTE_BIT, 0);
fillStageBindings(bindings, VK_SHADER_STAGE_COMPUTE_BIT, 0, 128);
VkDescriptorSetLayoutCreateInfo layoutInfo{
.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO,
@ -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 = 3 * 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 = 3 * 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,
};

3
rpcsx-gpu2/Renderer.cpp
View file

@ -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({

6
rpcsx-gpu2/lib/amdgpu-tiler/src/tiler_vulkan.cpp
View file

@ -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,
};