mirrors
/
dxvk
mirror of https://github.com/doitsujin/dxvk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[dxbc] Implemented domain shader input variables

This commit is contained in:
Philip Rebohle 2018-03-06 16:47:35 +01:00
parent ff0ff0c23b
commit 2271814d95
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
2 changed files with 111 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
src/dxbc/dxbc_compiler.cpp
View File

@ -485,6 +485,14 @@ namespace dxvk {
"oDepthLe");
} break;
case DxbcOperandType::InputDomainPoint: {
m_ds.builtinTessCoord = emitNewBuiltinVariable({
{ DxbcScalarType::Float32, 3, 0 },
spv::StorageClassInput },
spv::BuiltInTessCoord,
"vDomain");
} break;
case DxbcOperandType::OutputControlPointId:
case DxbcOperandType::InputForkInstanceId:
case DxbcOperandType::InputJoinInstanceId: {
@ -492,6 +500,13 @@ namespace dxvk {
// invocation ID, which has been declared already.
} break;
case DxbcOperandType::InputControlPoint:
case DxbcOperandType::InputPatchConstant:
case DxbcOperandType::OutputControlPoint: {
// These have been declared as global input and
// output arrays, so there's nothing left to do.
} break;
default:
Logger::err(str::format(
"DxbcCompiler: Unsupported operand type declaration: ",
@ -1055,9 +1070,16 @@ namespace dxvk {
void DxbcCompiler::emitDclInputControlPointCount(const DxbcShaderInstruction& ins) {
// dcl_input_control_points has the control point
// count embedded within the opcode token.
m_hs.vertexCountIn = ins.controls.controlPointCount;
emitDclInputArray(m_hs.vertexCountIn);
if (m_version.type() == DxbcProgramType::HullShader) {
m_hs.vertexCountIn = ins.controls.controlPointCount;
emitDclInputArray(m_hs.vertexCountIn);
} else {
m_ds.vertexCountIn = ins.controls.controlPointCount;
m_ds.inputPerPatch = emitTessInterfacePerPatch (spv::StorageClassInput);
m_ds.inputPerVertex = emitTessInterfacePerVertex(spv::StorageClassInput, m_ds.vertexCountIn);
}
}
@ -3873,15 +3895,33 @@ namespace dxvk {
for (uint32_t i = 0; i < operand.idxDim; i++)
indices.at(i) = emitIndexLoad(operand.idx[i]).id;
// Pick the input array depending on
// the program type and operand type
struct InputArray {
uint32_t id;
spv::StorageClass sclass;
};
const InputArray array = [&] () -> InputArray {
switch (operand.type) {
case DxbcOperandType::InputControlPoint:
return { m_ds.inputPerVertex, spv::StorageClassInput };
case DxbcOperandType::InputPatchConstant:
return { m_ds.inputPerPatch, spv::StorageClassInput };
default:
return { m_vArray, spv::StorageClassPrivate };
}
}();
DxbcRegisterInfo info;
info.type.ctype = result.type.ctype;
info.type.ccount = result.type.ccount;
info.type.alength = 0;
info.sclass = spv::StorageClassPrivate;
info.sclass = array.sclass;
result.id = m_module.opAccessChain(
getPointerTypeId(info), m_vArray,
getPointerTypeId(info), array.id,
operand.idxDim, indices.data());
return result;
@ -3999,6 +4039,8 @@ namespace dxvk {
return emitGetIndexableTempPtr(operand);
case DxbcOperandType::Input:
case DxbcOperandType::InputControlPoint:
case DxbcOperandType::InputPatchConstant:
return emitGetInputPtr(operand);
case DxbcOperandType::Output:
@ -4069,6 +4111,11 @@ namespace dxvk {
{ DxbcScalarType::Float32, 1 },
m_ps.builtinDepth };
case DxbcOperandType::InputDomainPoint:
return DxbcRegisterPointer {
{ DxbcScalarType::Float32, 3 },
m_ds.builtinTessCoord };
case DxbcOperandType::OutputControlPointId:
case DxbcOperandType::InputForkInstanceId:
case DxbcOperandType::InputJoinInstanceId:
@ -4692,10 +4739,9 @@ namespace dxvk {
case DxbcProgramType::VertexShader: emitVsSystemValueStore(sv, mask, value); break;
case DxbcProgramType::GeometryShader: emitGsSystemValueStore(sv, mask, value); break;
case DxbcProgramType::HullShader: emitHsSystemValueStore(sv, mask, value); break;
case DxbcProgramType::DomainShader:
case DxbcProgramType::PixelShader:
case DxbcProgramType::ComputeShader:
break;
case DxbcProgramType::DomainShader: emitDsSystemValueStore(sv, mask, value); break;
case DxbcProgramType::PixelShader: break;
case DxbcProgramType::ComputeShader: break;
}
}
}
@ -5018,6 +5064,24 @@ namespace dxvk {
}
void DxbcCompiler::emitDsSystemValueStore(
DxbcSystemValue sv,
DxbcRegMask mask,
const DxbcRegisterValue& value) {
switch (sv) {
case DxbcSystemValue::Position:
case DxbcSystemValue::CullDistance:
case DxbcSystemValue::ClipDistance:
emitVsSystemValueStore(sv, mask, value);
break;
default:
Logger::warn(str::format(
"DxbcCompiler: Unhandled DS SV output: ", sv));
}
}
void DxbcCompiler::emitInit() {
// Set up common capabilities for all shaders
m_module.enableCapability(spv::CapabilityShader);
@ -5112,6 +5176,28 @@ namespace dxvk {
m_ds.builtinTessLevelOuter = emitBuiltinTessLevelOuter(spv::StorageClassInput);
m_ds.builtinTessLevelInner = emitBuiltinTessLevelInner(spv::StorageClassInput);
// Declare the per-vertex output block
const uint32_t perVertexStruct = this->getPerVertexBlockId();
const uint32_t perVertexPointer = m_module.defPointerType(
perVertexStruct, spv::StorageClassOutput);
m_perVertexOut = m_module.newVar(
perVertexPointer, spv::StorageClassOutput);
m_entryPointInterfaces.push_back(m_perVertexOut);
m_module.setDebugName(m_perVertexOut, "ds_vertex_out");
// Main function of the domain shader
m_ds.functionId = m_module.allocateId();
m_module.setDebugName(m_ds.functionId, "ds_main");
m_module.functionBegin(
m_module.defVoidType(),
m_ds.functionId,
m_module.defFunctionType(
m_module.defVoidType(), 0, nullptr),
spv::FunctionControlMaskNone);
m_module.opLabel(m_module.allocateId());
}
@ -5248,7 +5334,10 @@ namespace dxvk {
void DxbcCompiler::emitDsFinalize() {
this->emitMainFunctionBegin();
// TODO implement
m_module.opFunctionCall(
m_module.defVoidType(),
m_ds.functionId, 0, nullptr);
this->emitOutputSetup();
this->emitMainFunctionEnd();
}

13
src/dxbc/dxbc_compiler.h
View File

@ -220,10 +220,16 @@ namespace dxvk {
* \brief Domain shader-specific structure
*/
struct DxbcCompilerDsPart {
uint32_t functionId = 0;
uint32_t functionId = 0;
uint32_t builtinTessCoord = 0;
uint32_t builtinTessLevelOuter = 0;
uint32_t builtinTessLevelInner = 0;
uint32_t vertexCountIn = 0;
uint32_t inputPerPatch = 0;
uint32_t inputPerVertex = 0;
};
@ -844,6 +850,11 @@ namespace dxvk {
DxbcRegMask mask,
const DxbcRegisterValue& value);
void emitDsSystemValueStore(
DxbcSystemValue sv,
DxbcRegMask mask,
const DxbcRegisterValue& value);
void emitGsSystemValueStore(
DxbcSystemValue sv,
DxbcRegMask mask,