The-Homebrew-Cloud/Cemu
2
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2025-02-21 12:17:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

flag samplers at more logical place, add reference from dsInfo

Browse Source
This commit is contained in:
goeiecool9999 2024-11-05 11:32:16 +01:00
parent 0866c4746b
commit de2cc13b0f
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRendererCore.cpp
View File

@ -900,6 +900,7 @@ VkDescriptorSetInfo* VulkanRenderer::draw_getOrCreateDescriptorSet(PipelineInfo*
} }
auto vkObjSampler = dsInfo->m_vkObjSamplers.emplace_back(new VKRObjectSampler); auto vkObjSampler = dsInfo->m_vkObjSamplers.emplace_back(new VKRObjectSampler);
dsInfo->m_vkObjDescriptorSet->addRef(vkObjSampler);
if (vkCreateSampler(m_logicalDevice, &samplerInfo, nullptr, &vkObjSampler->sampler) != VK_SUCCESS) if (vkCreateSampler(m_logicalDevice, &samplerInfo, nullptr, &vkObjSampler->sampler) != VK_SUCCESS)
UnrecoverableError("Failed to create texture sampler"); UnrecoverableError("Failed to create texture sampler");
@ -1169,6 +1170,8 @@ void VulkanRenderer::draw_prepareDescriptorSets(PipelineInfo* pipeline_info, VkD
{ {
auto descriptorSetInfo = draw_getOrCreateDescriptorSet(pipeline_info, vertexShader); auto descriptorSetInfo = draw_getOrCreateDescriptorSet(pipeline_info, vertexShader);
descriptorSetInfo->m_vkObjDescriptorSet->flagForCurrentCommandBuffer(); descriptorSetInfo->m_vkObjDescriptorSet->flagForCurrentCommandBuffer();
for(auto& sampler : descriptorSetInfo->m_vkObjSamplers)
sampler->flagForCurrentCommandBuffer();
vertexDS = descriptorSetInfo; vertexDS = descriptorSetInfo;
} }
@ -1176,6 +1179,8 @@ void VulkanRenderer::draw_prepareDescriptorSets(PipelineInfo* pipeline_info, VkD
{ {
auto descriptorSetInfo = draw_getOrCreateDescriptorSet(pipeline_info, pixelShader); auto descriptorSetInfo = draw_getOrCreateDescriptorSet(pipeline_info, pixelShader);
descriptorSetInfo->m_vkObjDescriptorSet->flagForCurrentCommandBuffer(); descriptorSetInfo->m_vkObjDescriptorSet->flagForCurrentCommandBuffer();
for(auto& sampler : descriptorSetInfo->m_vkObjSamplers)
sampler->flagForCurrentCommandBuffer();
pixelDS = descriptorSetInfo; pixelDS = descriptorSetInfo;
} }
@ -1184,6 +1189,8 @@ void VulkanRenderer::draw_prepareDescriptorSets(PipelineInfo* pipeline_info, VkD
{ {
auto descriptorSetInfo = draw_getOrCreateDescriptorSet(pipeline_info, geometryShader); auto descriptorSetInfo = draw_getOrCreateDescriptorSet(pipeline_info, geometryShader);
descriptorSetInfo->m_vkObjDescriptorSet->flagForCurrentCommandBuffer(); descriptorSetInfo->m_vkObjDescriptorSet->flagForCurrentCommandBuffer();
for(auto& sampler : descriptorSetInfo->m_vkObjSamplers)
sampler->flagForCurrentCommandBuffer();
geometryDS = descriptorSetInfo; geometryDS = descriptorSetInfo;
} }
} }
@ -1539,12 +1546,6 @@ void VulkanRenderer::draw_execute(uint32 baseVertex, uint32 baseInstance, uint32
draw_updateVkBlendConstants(); draw_updateVkBlendConstants();
// update descriptor sets // update descriptor sets
auto markSamplers = [this](VkDescriptorSetInfo* info) {
if(!info)
return;
for(auto& sampler : info->m_vkObjSamplers)
sampler->flagForCurrentCommandBuffer();
};
uint32_t dynamicOffsets[17 * 2]; uint32_t dynamicOffsets[17 * 2];
if (vertexDS && pixelDS) if (vertexDS && pixelDS)
{ {
@ -1591,9 +1592,6 @@ void VulkanRenderer::draw_execute(uint32 baseVertex, uint32 baseInstance, uint32
vkObjPipeline->pipeline_layout, 2, 1, &geometryDS->m_vkObjDescriptorSet->descriptorSet, numDynOffsets, vkObjPipeline->pipeline_layout, 2, 1, &geometryDS->m_vkObjDescriptorSet->descriptorSet, numDynOffsets,
dynamicOffsets); dynamicOffsets);
} }
markSamplers(vertexDS);
markSamplers(pixelDS);
markSamplers(geometryDS);
// draw // draw
if (hostIndexType != INDEX_TYPE::NONE) if (hostIndexType != INDEX_TYPE::NONE)