backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

[dxbc] Implement support for SV_PrimitiveID

Browse Source 
Fixes some geometry/tessellation shaders in The Witcher 3.
This commit is contained in:
Philip Rebohle 2018-04-08 18:25:44 +02:00
parent 83a0eda4f6
commit e38cc4a0e0
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
2 changed files with 56 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/dxbc/dxbc_compiler.cpp
View File

@ -493,6 +493,14 @@ namespace dxvk {
"oDepthLe"); "oDepthLe");
} break; } break;
case DxbcOperandType::InputPrimitiveId: {
m_primitiveIdIn = emitNewBuiltinVariable({
{ DxbcScalarType::Uint32, 1, 0 },
spv::StorageClassInput },
spv::BuiltInPrimitiveId,
"vPrim");
} break;
case DxbcOperandType::InputDomainPoint: { case DxbcOperandType::InputDomainPoint: {
m_ds.builtinTessCoord = emitNewBuiltinVariable({ m_ds.builtinTessCoord = emitNewBuiltinVariable({
{ DxbcScalarType::Float32, 3, 0 }, { DxbcScalarType::Float32, 3, 0 },
@ -4247,6 +4255,11 @@ namespace dxvk {
{ DxbcScalarType::Float32, 1 }, { DxbcScalarType::Float32, 1 },
m_ps.builtinDepth }; m_ps.builtinDepth };
case DxbcOperandType::InputPrimitiveId:
return DxbcRegisterPointer {
{ DxbcScalarType::Uint32, 1 },
m_primitiveIdIn };
case DxbcOperandType::InputDomainPoint: case DxbcOperandType::InputDomainPoint:
return DxbcRegisterPointer { return DxbcRegisterPointer {
{ DxbcScalarType::Float32, 3 }, { DxbcScalarType::Float32, 3 },
@ -5045,6 +5058,24 @@ namespace dxvk {
return result; return result;
} break; } break;
case DxbcSystemValue::PrimitiveId: {
if (m_primitiveIdIn == 0) {
m_module.enableCapability(spv::CapabilityGeometry);
m_primitiveIdIn = emitNewBuiltinVariable({
{ DxbcScalarType::Uint32, 1, 0 },
spv::StorageClassInput },
spv::BuiltInPrimitiveId,
"ps_primitive_id");
}
DxbcRegisterPointer ptrIn;
ptrIn.type = { DxbcScalarType::Uint32, 1 };
ptrIn.id = m_primitiveIdIn;
return emitValueLoad(ptrIn);
} break;
case DxbcSystemValue::SampleIndex: { case DxbcSystemValue::SampleIndex: {
if (m_ps.builtinSampleId == 0) { if (m_ps.builtinSampleId == 0) {
m_module.enableCapability(spv::CapabilitySampleRateShading); m_module.enableCapability(spv::CapabilitySampleRateShading);
@ -5207,9 +5238,8 @@ namespace dxvk {
} }
DxbcRegisterPointer ptr; DxbcRegisterPointer ptr;
ptr.type.ctype = DxbcScalarType::Uint32; ptr.type = { DxbcScalarType::Uint32 };
ptr.type.ccount = 1; ptr.id = m_gs.builtinLayer;
ptr.id = m_gs.builtinLayer;
emitValueStore( emitValueStore(
ptr, emitRegisterExtract(value, mask), ptr, emitRegisterExtract(value, mask),
@ -5228,9 +5258,26 @@ namespace dxvk {
} }
DxbcRegisterPointer ptr; DxbcRegisterPointer ptr;
ptr.type.ctype = DxbcScalarType::Uint32; ptr.type = { DxbcScalarType::Uint32, 1};
ptr.type.ccount = 1; ptr.id = m_gs.builtinViewportId;
ptr.id = m_gs.builtinViewportId;
emitValueStore(
ptr, emitRegisterExtract(value, mask),
DxbcRegMask(true, false, false, false));
} break;
case DxbcSystemValue::PrimitiveId: {
if (m_primitiveIdOut == 0) {
m_primitiveIdOut = emitNewBuiltinVariable({
{ DxbcScalarType::Uint32, 1, 0 },
spv::StorageClassOutput },
spv::BuiltInPrimitiveId,
"gs_primitive_id");
}
DxbcRegisterPointer ptr;
ptr.type = { DxbcScalarType::Uint32, 1};
ptr.id = m_primitiveIdOut;
emitValueStore( emitValueStore(
ptr, emitRegisterExtract(value, mask), ptr, emitRegisterExtract(value, mask),

7
src/dxbc/dxbc_compiler.h
View File

@ -397,6 +397,9 @@ namespace dxvk {
uint32_t m_clipDistances = 0; uint32_t m_clipDistances = 0;
uint32_t m_cullDistances = 0; uint32_t m_cullDistances = 0;
uint32_t m_primitiveIdIn = 0;
uint32_t m_primitiveIdOut = 0;
////////////////////////////////////////////////// //////////////////////////////////////////////////
// Immediate constant buffer. If defined, this is // Immediate constant buffer. If defined, this is
// an array of four-component uint32 vectors. // an array of four-component uint32 vectors.
@ -412,10 +415,6 @@ namespace dxvk {
uint32_t m_uavCtrStructType = 0; uint32_t m_uavCtrStructType = 0;
uint32_t m_uavCtrPointerType = 0; uint32_t m_uavCtrPointerType = 0;
////////////////////////////////
// Push constant block variable
uint32_t m_pushConstantBlock = 0;
/////////////////////////////////////////////////// ///////////////////////////////////////////////////
// Entry point description - we'll need to declare // Entry point description - we'll need to declare
// the function ID and all input/output variables. // the function ID and all input/output variables.