From c080bb8417e4ea79730a78c7573186436fc2edd3 Mon Sep 17 00:00:00 2001 From: Caleb Cornett Date: Sat, 21 Dec 2024 20:01:34 -0500 Subject: [PATCH] GPU: Fix non-triangle D3D12 primitive topology types --- src/gpu/d3d12/SDL_gpu_d3d12.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/gpu/d3d12/SDL_gpu_d3d12.c b/src/gpu/d3d12/SDL_gpu_d3d12.c index 47612b7ca1..dc02000e6b 100644 --- a/src/gpu/d3d12/SDL_gpu_d3d12.c +++ b/src/gpu/d3d12/SDL_gpu_d3d12.c @@ -568,6 +568,14 @@ static D3D12_PRIMITIVE_TOPOLOGY SDLToD3D12_PrimitiveType[] = { D3D_PRIMITIVE_TOPOLOGY_POINTLIST // POINTLIST }; +static D3D12_PRIMITIVE_TOPOLOGY_TYPE SDLToD3D12_PrimitiveTopologyType[] = { + D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE, // TRIANGLELIST + D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE, // TRIANGLESTRIP + D3D12_PRIMITIVE_TOPOLOGY_TYPE_LINE, // LINELIST + D3D12_PRIMITIVE_TOPOLOGY_TYPE_LINE, // LINESTRIP + D3D12_PRIMITIVE_TOPOLOGY_TYPE_POINT // POINTLIST +}; + static D3D12_TEXTURE_ADDRESS_MODE SDLToD3D12_SamplerAddressMode[] = { D3D12_TEXTURE_ADDRESS_MODE_WRAP, // REPEAT D3D12_TEXTURE_ADDRESS_MODE_MIRROR, // MIRRORED_REPEAT @@ -2864,7 +2872,7 @@ static SDL_GPUGraphicsPipeline *D3D12_CreateGraphicsPipeline( D3D12_INTERNAL_ConvertVertexInputState(createinfo->vertex_input_state, inputElementDescs, renderer->semantic); } - psoDesc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE; + psoDesc.PrimitiveTopologyType = SDLToD3D12_PrimitiveTopologyType[createinfo->primitive_type]; if (!D3D12_INTERNAL_ConvertRasterizerState(createinfo->rasterizer_state, &psoDesc.RasterizerState)) { return NULL;