fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Vulkan] Don't try to create geometry shader for rectangle list

Browse Source
This commit is contained in:
Herman S.
2025-11-03 11:56:30 +09:00
parent ec5816a278
commit 5be503da77
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/xenia/gpu/vulkan/vulkan_pipeline_cache.cc
View File

@@ -553,7 +553,13 @@ bool VulkanPipelineCache::GetCurrentStateDescription(
primitive_topology = PipelinePrimitiveTopology::kTriangleStrip; primitive_topology = PipelinePrimitiveTopology::kTriangleStrip;
break; break;
case xenos::PrimitiveType::kRectangleList: case xenos::PrimitiveType::kRectangleList:
geometry_shader = PipelineGeometryShader::kRectangleList; // Only use geometry shader if not using the fallback AsTriangleStrip
// vertex shader type (which is used when geometry shaders aren't
// supported).
if (primitive_processing_result.host_vertex_shader_type !=
Shader::HostVertexShaderType::kRectangleListAsTriangleStrip) {
geometry_shader = PipelineGeometryShader::kRectangleList;
}
primitive_topology = PipelinePrimitiveTopology::kTriangleList; primitive_topology = PipelinePrimitiveTopology::kTriangleList;
break; break;
case xenos::PrimitiveType::kQuadList: case xenos::PrimitiveType::kQuadList:
@@ -765,12 +771,15 @@ bool VulkanPipelineCache::GetGeometryShaderKey(
// For kPointListAsTriangleStrip, output_point_parameters has a different // For kPointListAsTriangleStrip, output_point_parameters has a different
// meaning (the coordinates, not the size). However, the AsTriangleStrip host // meaning (the coordinates, not the size). However, the AsTriangleStrip host
// vertex shader types are needed specifically when geometry shaders are not // vertex shader types are needed specifically when geometry shaders are not
// supported as fallbacks. // supported as fallbacks - in that case, geometry_shader_type should be kNone
// and this function shouldn't be called.
if (vertex_shader_modification.vertex.host_vertex_shader_type == if (vertex_shader_modification.vertex.host_vertex_shader_type ==
Shader::HostVertexShaderType::kPointListAsTriangleStrip || Shader::HostVertexShaderType::kPointListAsTriangleStrip ||
vertex_shader_modification.vertex.host_vertex_shader_type == vertex_shader_modification.vertex.host_vertex_shader_type ==
Shader::HostVertexShaderType::kRectangleListAsTriangleStrip) { Shader::HostVertexShaderType::kRectangleListAsTriangleStrip) {
assert_always(); XELOGE(
"GetGeometryShaderKey: AsTriangleStrip vertex shader types should not "
"be used with geometry shaders");
return false; return false;
} }
GeometryShaderKey key; GeometryShaderKey key;