rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-02-27 13:54:16 +01:00
Code Issues Projects Releases Wiki Activity

[dxbc] Write back GS input topology to shader info

Browse Source
This commit is contained in:
Philip Rebohle 2025-02-26 12:57:49 +01:00 committed by Philip Rebohle
parent 2cb9d40f88
commit 96a260e94e
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/dxbc/dxbc_compiler.cpp
View File

@ -208,6 +208,9 @@ namespace dxvk {
// End the main function // End the main function
emitFunctionEnd(); emitFunctionEnd();
// For pass-through we always assume points
m_inputTopology = VK_PRIMITIVE_TOPOLOGY_POINT_LIST;
} }
@ -243,6 +246,7 @@ namespace dxvk {
info.outputMask = m_outputMask; info.outputMask = m_outputMask;
info.pushConstStages = VK_SHADER_STAGE_FRAGMENT_BIT; info.pushConstStages = VK_SHADER_STAGE_FRAGMENT_BIT;
info.pushConstSize = sizeof(DxbcPushConstants); info.pushConstSize = sizeof(DxbcPushConstants);
info.inputTopology = m_inputTopology;
info.outputTopology = m_outputTopology; info.outputTopology = m_outputTopology;
if (m_programInfo.type() == DxbcProgramType::HullShader) if (m_programInfo.type() == DxbcProgramType::HullShader)
@ -1292,24 +1296,22 @@ namespace dxvk {
// The input primitive type is stored within in the // The input primitive type is stored within in the
// control bits of the opcode token. In SPIR-V, we // control bits of the opcode token. In SPIR-V, we
// have to define an execution mode. // have to define an execution mode.
const spv::ExecutionMode mode = [&] { const auto mode = [&] {
switch (ins.controls.primitive()) { switch (ins.controls.primitive()) {
case DxbcPrimitive::Point: return spv::ExecutionModeInputPoints; case DxbcPrimitive::Point: return std::make_pair(VK_PRIMITIVE_TOPOLOGY_POINT_LIST, spv::ExecutionModeInputPoints);
case DxbcPrimitive::Line: return spv::ExecutionModeInputLines; case DxbcPrimitive::Line: return std::make_pair(VK_PRIMITIVE_TOPOLOGY_LINE_LIST, spv::ExecutionModeInputLines);
case DxbcPrimitive::Triangle: return spv::ExecutionModeTriangles; case DxbcPrimitive::Triangle: return std::make_pair(VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST, spv::ExecutionModeTriangles);
case DxbcPrimitive::LineAdj: return spv::ExecutionModeInputLinesAdjacency; case DxbcPrimitive::LineAdj: return std::make_pair(VK_PRIMITIVE_TOPOLOGY_LINE_LIST_WITH_ADJACENCY, spv::ExecutionModeInputLinesAdjacency);
case DxbcPrimitive::TriangleAdj: return spv::ExecutionModeInputTrianglesAdjacency; case DxbcPrimitive::TriangleAdj: return std::make_pair(VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST_WITH_ADJACENCY, spv::ExecutionModeInputTrianglesAdjacency);
default: throw DxvkError("DxbcCompiler: Unsupported primitive type"); default: throw DxvkError("DxbcCompiler: Unsupported primitive type");
} }
}(); }();
m_gs.inputPrimitive = ins.controls.primitive(); m_gs.inputPrimitive = ins.controls.primitive();
m_module.setExecutionMode(m_entryPointId, mode); m_module.setExecutionMode(m_entryPointId, mode.second);
m_inputTopology = mode.first;
const uint32_t vertexCount emitDclInputArray(primitiveVertexCount(m_gs.inputPrimitive));
= primitiveVertexCount(m_gs.inputPrimitive);
emitDclInputArray(vertexCount);
} }

1
src/dxbc/dxbc_compiler.h
View File

@ -562,6 +562,7 @@ namespace dxvk {
DxbcOpcode m_lastOp = DxbcOpcode::Nop; DxbcOpcode m_lastOp = DxbcOpcode::Nop;
DxbcOpcode m_currOp = DxbcOpcode::Nop; DxbcOpcode m_currOp = DxbcOpcode::Nop;
VkPrimitiveTopology m_inputTopology = VK_PRIMITIVE_TOPOLOGY_MAX_ENUM;
VkPrimitiveTopology m_outputTopology = VK_PRIMITIVE_TOPOLOGY_MAX_ENUM; VkPrimitiveTopology m_outputTopology = VK_PRIMITIVE_TOPOLOGY_MAX_ENUM;
///////////////////////////////////////////////////// /////////////////////////////////////////////////////