yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

vk_graphics_pipeline: Guard against non-tessellation pipelines using patches

This commit is contained in:
ReinUsesLisp 2021-04-23 07:33:21 -03:00 committed by ameerj
parent 57464e3b72
commit 5b1b06f11e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
View File

@ -345,12 +345,18 @@ void GraphicsPipeline::MakePipeline(const Device& device, VkRenderPass render_pa
if (!vertex_binding_divisors.empty()) { if (!vertex_binding_divisors.empty()) {
vertex_input_ci.pNext = &input_divisor_ci; vertex_input_ci.pNext = &input_divisor_ci;
} }
const auto input_assembly_topology = MaxwellToVK::PrimitiveTopology(device, state.topology); auto input_assembly_topology = MaxwellToVK::PrimitiveTopology(device, state.topology);
if (input_assembly_topology == VK_PRIMITIVE_TOPOLOGY_PATCH_LIST) {
if (!spv_modules[1] && !spv_modules[2]) {
LOG_WARNING(Render_Vulkan, "Patch topology used without tessellation, using points");
input_assembly_topology = VK_PRIMITIVE_TOPOLOGY_POINT_LIST;
}
}
const VkPipelineInputAssemblyStateCreateInfo input_assembly_ci{ const VkPipelineInputAssemblyStateCreateInfo input_assembly_ci{
.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO, .sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO,
.pNext = nullptr, .pNext = nullptr,
.flags = 0, .flags = 0,
.topology = MaxwellToVK::PrimitiveTopology(device, state.topology), .topology = input_assembly_topology,
.primitiveRestartEnable = state.primitive_restart_enable != 0 && .primitiveRestartEnable = state.primitive_restart_enable != 0 &&
SupportsPrimitiveRestart(input_assembly_topology), SupportsPrimitiveRestart(input_assembly_topology),
}; };