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

[dxso] Initialize vPos value at the start of the shader

Browse Source 
Otherwise we can end up initializing it in a branch and that's no good.

Closes https://github.com/doitsujin/dxvk/issues/1294
This commit is contained in:
Joshua Ashton 2020-01-26 18:40:32 +00:00
parent b4666ac044
commit 65f4437417
1 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/dxso/dxso_compiler.cpp
View File

@ -1188,39 +1188,15 @@ namespace dxvk {
case DxsoRegisterType::MiscType: case DxsoRegisterType::MiscType:
if (reg.id.num == MiscTypePosition) { if (reg.id.num == MiscTypePosition) {
if (m_ps.vPos.id == 0) { if (m_ps.vPos.id == 0) {
DxsoRegisterPointer fragCoord = this->emitRegisterPtr(
"ps_frag_coord", DxsoScalarType::Float32, 4, 0,
spv::StorageClassInput, spv::BuiltInFragCoord);
DxsoRegisterValue val = this->emitValueLoad(fragCoord);
val.id = m_module.opFSub(
getVectorTypeId(val.type), val.id,
m_module.constvec4f32(0.5f, 0.5f, 0.0f, 0.0f));
m_ps.vPos = this->emitRegisterPtr( m_ps.vPos = this->emitRegisterPtr(
"vPos", DxsoScalarType::Float32, 4, 0); "vPos", DxsoScalarType::Float32, 4, 0);
m_module.opStore(m_ps.vPos.id, val.id);
} }
return m_ps.vPos; return m_ps.vPos;
} }
else { // MiscTypeFace else { // MiscTypeFace
if (m_ps.vFace.id == 0) { if (m_ps.vFace.id == 0) {
DxsoRegisterPointer faceBool = this->emitRegisterPtr(
"ps_is_front_face", DxsoScalarType::Bool, 1, 0,
spv::StorageClassInput, spv::BuiltInFrontFacing);
DxsoRegisterValue frontFace = emitValueLoad(faceBool);
DxsoRegisterValue selectOp = emitRegisterExtend(frontFace, 4);
m_ps.vFace = this->emitRegisterPtr( m_ps.vFace = this->emitRegisterPtr(
"vFace", DxsoScalarType::Float32, 4, 0); "vFace", DxsoScalarType::Float32, 4, 0);
m_module.opStore(
m_ps.vFace.id,
m_module.opSelect(getVectorTypeId(m_ps.vFace.type), selectOp.id,
m_module.constvec4f32( 1.0f, 1.0f, 1.0f, 1.0f),
m_module.constvec4f32(-1.0f, -1.0f, -1.0f, -1.0f)));
} }
return m_ps.vFace; return m_ps.vFace;
} }
@ -3533,6 +3509,35 @@ void DxsoCompiler::emitControlFlowGenericLoop(
this->emitMainFunctionBegin(); this->emitMainFunctionBegin();
this->emitInputSetup(); this->emitInputSetup();
if (m_ps.vPos.id != 0) {
DxsoRegisterPointer fragCoord = this->emitRegisterPtr(
"ps_frag_coord", DxsoScalarType::Float32, 4, 0,
spv::StorageClassInput, spv::BuiltInFragCoord);
DxsoRegisterValue val = this->emitValueLoad(fragCoord);
val.id = m_module.opFSub(
getVectorTypeId(val.type), val.id,
m_module.constvec4f32(0.5f, 0.5f, 0.0f, 0.0f));
m_module.opStore(m_ps.vPos.id, val.id);
}
if (m_ps.vFace.id != 0) {
DxsoRegisterPointer faceBool = this->emitRegisterPtr(
"ps_is_front_face", DxsoScalarType::Bool, 1, 0,
spv::StorageClassInput, spv::BuiltInFrontFacing);
DxsoRegisterValue frontFace = emitValueLoad(faceBool);
DxsoRegisterValue selectOp = emitRegisterExtend(frontFace, 4);
m_module.opStore(
m_ps.vFace.id,
m_module.opSelect(getVectorTypeId(m_ps.vFace.type), selectOp.id,
m_module.constvec4f32( 1.0f, 1.0f, 1.0f, 1.0f),
m_module.constvec4f32(-1.0f, -1.0f, -1.0f, -1.0f)));
}
m_module.opFunctionCall( m_module.opFunctionCall(
m_module.defVoidType(), m_module.defVoidType(),
m_ps.functionId, 0, nullptr); m_ps.functionId, 0, nullptr);