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

[dxbc] Implemented continue instructions

Browse Source
This commit is contained in:
Philip Rebohle 2017-12-29 22:54:25 +01:00
parent 660ac25b18
commit b968aa0472
4 changed files with 41 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/dxbc/dxbc_compiler.cpp
View File

@ -2148,11 +2148,28 @@ namespace dxvk {
}
void DxbcCompiler::emitControlFlowBreakc(const DxbcShaderInstruction& ins) {
void DxbcCompiler::emitControlFlowBreak(const DxbcShaderInstruction& ins) {
const bool isBreak = ins.op == DxbcOpcode::Break;
DxbcCfgBlock* loopBlock = cfgFindLoopBlock();
if (loopBlock == nullptr)
throw DxvkError("DxbcCompiler: 'Breakc' outside 'Loop' found");
throw DxvkError("DxbcCompiler: 'Break' or 'Continue' outside 'Loop' found");
m_module.opBranch(isBreak
? loopBlock->b_loop.labelBreak
: loopBlock->b_loop.labelContinue);
m_module.opLabel (m_module.allocateId());
}
void DxbcCompiler::emitControlFlowBreakc(const DxbcShaderInstruction& ins) {
const bool isBreak = ins.op == DxbcOpcode::Breakc;
DxbcCfgBlock* loopBlock = cfgFindLoopBlock();
if (loopBlock == nullptr)
throw DxvkError("DxbcCompiler: 'Breakc' or 'Continuec' outside 'Loop' found");
// Perform zero test on the first component of the condition
const DxbcRegisterValue condition = emitRegisterLoad(
@ -2172,7 +2189,9 @@ namespace dxvk {
zeroTest.id, breakBlock, mergeBlock);
m_module.opLabel(breakBlock);
m_module.opBranch(loopBlock->b_loop.labelBreak);
m_module.opBranch(isBreak
? loopBlock->b_loop.labelBreak
: loopBlock->b_loop.labelContinue);
m_module.opLabel(mergeBlock);
}
@ -2229,7 +2248,12 @@ namespace dxvk {
case DxbcOpcode::EndLoop:
return this->emitControlFlowEndLoop(ins);
case DxbcOpcode::Break:
case DxbcOpcode::Continue:
return this->emitControlFlowBreak(ins);
case DxbcOpcode::Breakc:
case DxbcOpcode::Continuec:
return this->emitControlFlowBreakc(ins);
case DxbcOpcode::Ret:

3
src/dxbc/dxbc_compiler.h
View File

@ -427,6 +427,9 @@ namespace dxvk {
void emitControlFlowEndLoop(
const DxbcShaderInstruction& ins);
void emitControlFlowBreak(
const DxbcShaderInstruction& ins);
void emitControlFlowBreakc(
const DxbcShaderInstruction& ins);

4
src/dxbc/dxbc_decoder.cpp
View File

@ -148,6 +148,10 @@ namespace dxvk {
m_instruction.sampleControls.w = aoffimmi.w;
} break;
case DxbcExtOpcode::ResourceDim:
case DxbcExtOpcode::ResourceReturnType:
break; // part of resource description
default:
Logger::warn(str::format(
"DxbcDecodeContext: Unhandled extended opcode: ",

10
src/dxbc/dxbc_defs.cpp
View File

@ -30,7 +30,9 @@ namespace dxvk {
{ DxbcOperandKind::SrcReg, DxbcScalarType::Uint32 },
} },
/* Case */
{ },
{ 1, DxbcInstClass::ControlFlow, {
{ DxbcOperandKind::SrcReg, DxbcScalarType::Uint32 },
} },
/* Continue */
{ 0, DxbcInstClass::ControlFlow },
/* Continuec */
@ -90,7 +92,7 @@ namespace dxvk {
/* EndLoop */
{ 0, DxbcInstClass::ControlFlow },
/* EndSwitch */
{ },
{ 0, DxbcInstClass::ControlFlow },
/* Eq */
{ 3, DxbcInstClass::VectorCmp, {
{ DxbcOperandKind::DstReg, DxbcScalarType::Uint32 },
@ -371,7 +373,9 @@ namespace dxvk {
{ DxbcOperandKind::SrcReg, DxbcScalarType::Float32 },
} },
/* Switch */
{ },
{ 1, DxbcInstClass::ControlFlow, {
{ DxbcOperandKind::SrcReg, DxbcScalarType::Uint32 },
} },
/* SinCos */
{ 3, DxbcInstClass::VectorSinCos, {
{ DxbcOperandKind::DstReg, DxbcScalarType::Float32 },