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

[dxbc] Formatting fixes + Hull shader barriers

Browse Source
This commit is contained in:
Philip Rebohle 2018-03-05 16:14:46 +01:00
parent 96ca9fa6ea
commit 4688b2cc5a
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/dxbc/dxbc_compiler.cpp
View File

@ -372,11 +372,11 @@ namespace dxvk {
// be stored in the second operand. // be stored in the second operand.
const bool hasSv = const bool hasSv =
ins.op == DxbcOpcode::DclInputSgv ins.op == DxbcOpcode::DclInputSgv
|| ins.op == DxbcOpcode::DclInputSiv || ins.op == DxbcOpcode::DclInputSiv
|| ins.op == DxbcOpcode::DclInputPsSgv || ins.op == DxbcOpcode::DclInputPsSgv
|| ins.op == DxbcOpcode::DclInputPsSiv || ins.op == DxbcOpcode::DclInputPsSiv
|| ins.op == DxbcOpcode::DclOutputSgv || ins.op == DxbcOpcode::DclOutputSgv
|| ins.op == DxbcOpcode::DclOutputSiv; || ins.op == DxbcOpcode::DclOutputSiv;
DxbcSystemValue sv = DxbcSystemValue::None; DxbcSystemValue sv = DxbcSystemValue::None;
@ -387,7 +387,7 @@ namespace dxvk {
// interpolation mode that is part of the op token. // interpolation mode that is part of the op token.
const bool hasInterpolationMode = const bool hasInterpolationMode =
ins.op == DxbcOpcode::DclInputPs ins.op == DxbcOpcode::DclInputPs
|| ins.op == DxbcOpcode::DclInputPsSiv; || ins.op == DxbcOpcode::DclInputPsSiv;
DxbcInterpolationMode im = DxbcInterpolationMode::Undefined; DxbcInterpolationMode im = DxbcInterpolationMode::Undefined;
@ -603,7 +603,6 @@ namespace dxvk {
m_interfaceSlots.outputSlots |= 1u << regIdx; m_interfaceSlots.outputSlots |= 1u << regIdx;
} }
// Add a new system value mapping if needed // Add a new system value mapping if needed
if (sv != DxbcSystemValue::None) if (sv != DxbcSystemValue::None)
m_oMappings.push_back({ regIdx, regMask, sv }); m_oMappings.push_back({ regIdx, regMask, sv });
@ -5122,11 +5121,17 @@ namespace dxvk {
void DxbcCompiler::emitHsFinalize() { void DxbcCompiler::emitHsFinalize() {
this->emitHsControlPointPhase(m_hs.cpPhase); this->emitHsControlPointPhase(m_hs.cpPhase);
if (m_hs.forkPhases.size() != 0
|| m_hs.joinPhases.size() != 0)
this->emitHsPhaseBarrier();
for (const auto& phase : m_hs.forkPhases) for (const auto& phase : m_hs.forkPhases)
this->emitHsForkJoinPhase(phase); this->emitHsForkJoinPhase(phase);
for (const auto& phase : m_hs.joinPhases) for (const auto& phase : m_hs.joinPhases)
this->emitHsForkJoinPhase(phase); this->emitHsForkJoinPhase(phase);
// TODO set up output variables
} }
@ -5247,6 +5252,15 @@ namespace dxvk {
} }
void DxbcCompiler::emitHsPhaseBarrier() {
uint32_t exeScopeId = m_module.constu32(spv::ScopeWorkgroup);
uint32_t memScopeId = m_module.constu32(spv::ScopeInvocation);
uint32_t semanticId = m_module.constu32(spv::MemorySemanticsMaskNone);
m_module.opControlBarrier(exeScopeId, memScopeId, semanticId);
}
uint32_t DxbcCompiler::emitNewVariable(const DxbcRegisterInfo& info) { uint32_t DxbcCompiler::emitNewVariable(const DxbcRegisterInfo& info) {
const uint32_t ptrTypeId = this->getPointerTypeId(info); const uint32_t ptrTypeId = this->getPointerTypeId(info);
return m_module.newVar(ptrTypeId, info.sclass); return m_module.newVar(ptrTypeId, info.sclass);

2
src/dxbc/dxbc_compiler.h
View File

@ -867,6 +867,8 @@ namespace dxvk {
void emitHsForkJoinPhase( void emitHsForkJoinPhase(
const DxbcCompilerHsForkJoinPhase& phase); const DxbcCompilerHsForkJoinPhase& phase);
void emitHsPhaseBarrier();
////////////// //////////////
// Misc stuff // Misc stuff
void emitDclInputArray( void emitDclInputArray(