ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Azurik render issue 

Remove #ifndef blocks that were driven by the opposite define than they should have been
Also provide the opposite flag as a comment, next to where the 'driver' define
This commit is contained in:
Anthony 2021-03-11 21:53:42 +13:00 committed by PatrickvL
parent ad1652f050
commit 512502ce36
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/hle/D3D8/Direct3D9/CxbxPixelShaderTemplate.hlsl
View File

@ -93,17 +93,6 @@ uniform const float FRONTFACE_FACTOR : register(c27); // Note : PSH_XBOX_CONSTA
// Second raw string :
R"DELIMITER(
// Define defaults when their inverses are not defined (handy while compiler isn't yet providing these) :
#ifndef PS_COMBINERCOUNT_SAME_C0
#define PS_COMBINERCOUNT_UNIQUE_C0
#endif
#ifndef PS_COMBINERCOUNT_SAME_C1
#define PS_COMBINERCOUNT_UNIQUE_C1
#endif
#ifndef PS_COMBINERCOUNT_MUX_LSB
#define PS_COMBINERCOUNT_MUX_MSB
#endif
// PS_COMBINERCOUNT_UNIQUE_C0 steers whether for C0 to use stage-specific constants c0_0 .. c0_7, or c0_0 for all stages
#ifdef PS_COMBINERCOUNT_UNIQUE_C0
#define C0 c0_[stage] // concatenate stage to form c0_0 .. c0_7

34
src/core/hle/D3D8/Direct3D9/PixelShader.cpp
View File

@ -219,12 +219,24 @@ void FinalCombinerStageHlsl(std::stringstream& hlsl, RPSFinalCombiner& fc)
hlsl << "\n " << opcode_comment[5][0] << "(" << arguments.str() << "); // " << opcode_comment[5][1];
}
void OutputDefine(std::stringstream& hlsl, std::string define_str, bool enabled)
void OutputDefineFlag(std::stringstream& hlsl, bool enabled, std::string_view define_enabled, std::string_view define_disabled = "")
{
if (enabled)
hlsl << "\n#define " << define_str;
else
hlsl << "\n#undef " << define_str;
if (define_disabled.length() > 0) {
if (enabled) {
hlsl << "\n#define " << define_enabled << " // not " << define_disabled;
}
else {
hlsl << "\n#define " << define_disabled << " // not " << define_enabled;
}
}
else {
if (enabled) {
hlsl << "\n#define " << define_enabled;
}
else {
hlsl << "\n#undef " << define_enabled;
}
}
}
/* Disabled, until BumpDemo is fixed (which with this code, inadvertedly skips stage 1 and 2 dotproducts) :
@ -285,9 +297,9 @@ void BuildShader(DecodedRegisterCombiner* pShader, std::stringstream& hlsl)
hlsl << "\n#define PS_COMBINERCOUNT " << pShader->NumberOfCombiners;
if (pShader->NumberOfCombiners > 0) {
OutputDefine(hlsl, "PS_COMBINERCOUNT_UNIQUE_C0", pShader->CombinerHasUniqueC0);
OutputDefine(hlsl, "PS_COMBINERCOUNT_UNIQUE_C1", pShader->CombinerHasUniqueC1);
OutputDefine(hlsl, "PS_COMBINERCOUNT_MUX_MSB", pShader->CombinerMuxesOnMsb);
OutputDefineFlag(hlsl, pShader->CombinerHasUniqueC0, "PS_COMBINERCOUNT_UNIQUE_C0", "PS_COMBINERCOUNT_SAME_C0");
OutputDefineFlag(hlsl, pShader->CombinerHasUniqueC1, "PS_COMBINERCOUNT_UNIQUE_C1", "PS_COMBINERCOUNT_SAME_C1");
OutputDefineFlag(hlsl, pShader->CombinerMuxesOnMsb, "PS_COMBINERCOUNT_MUX_MSB", "PS_COMBINERCOUNT_MUX_LSB");
}
for (unsigned i = 0; i < PSH_XBOX_MAX_T_REGISTER_COUNT; i++) {
@ -320,9 +332,9 @@ void BuildShader(DecodedRegisterCombiner* pShader, std::stringstream& hlsl)
}
if (pShader->hasFinalCombiner) {
OutputDefine(hlsl, "PS_FINALCOMBINERSETTING_COMPLEMENT_V1", pShader->FinalCombiner.ComplementV1);
OutputDefine(hlsl, "PS_FINALCOMBINERSETTING_COMPLEMENT_R0", pShader->FinalCombiner.ComplementR0);
OutputDefine(hlsl, "PS_FINALCOMBINERSETTING_CLAMP_SUM", pShader->FinalCombiner.ClampSum);
OutputDefineFlag(hlsl, pShader->FinalCombiner.ComplementV1, "PS_FINALCOMBINERSETTING_COMPLEMENT_V1");
OutputDefineFlag(hlsl, pShader->FinalCombiner.ComplementR0, "PS_FINALCOMBINERSETTING_COMPLEMENT_R0");
OutputDefineFlag(hlsl, pShader->FinalCombiner.ClampSum, "PS_FINALCOMBINERSETTING_CLAMP_SUM");
}
hlsl << hlsl_template[1];