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

Fixup sampling cube textures with PROJECT2D 

Use CUBEMAP sampling instead
Fixes lighting in Splinter Cell Chaos Theory
This commit is contained in:
Anthony 2022-01-09 22:50:59 +13:00
parent a25e455289
commit a844dffa95
1 changed files with 63 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
src/core/hle/D3D8/XbPixelShader.cpp
View File

@ -489,62 +489,73 @@ typedef struct s_CxbxPSDef {
void AdjustTextureModes(DecodedRegisterCombiner &RC) void AdjustTextureModes(DecodedRegisterCombiner &RC)
{ {
// if this flag is set, the texture mode for each texture stage is adjusted as follows: // if this flag is set, the texture mode for each texture stage is adjusted as follows:
if (!RC.TexModeAdjust) return; if (RC.TexModeAdjust) {
for (int i = 0; i < xbox::X_D3DTS_STAGECOUNT; i++) {
// First, disable not-assigned textures
if (ActiveTextureTypes[i] == xbox::X_D3DRTYPE_NONE) {
RC.PSTextureModes[i] = PS_TEXTUREMODES_NONE;
continue;
}
for (int i = 0; i < xbox::X_D3DTS_STAGECOUNT; i++) { // Then adjust some texture mode according to the currently active textures, so that the shader will use the appropriate sampling method
// First, disable not-assigned textures switch (RC.PSTextureModes[i]) {
if (ActiveTextureTypes[i] == xbox::X_D3DRTYPE_NONE) { case PS_TEXTUREMODES_PROJECT2D:
RC.PSTextureModes[i] = PS_TEXTUREMODES_NONE; case PS_TEXTUREMODES_PROJECT3D:
continue; case PS_TEXTUREMODES_CUBEMAP:
} if (ActiveTextureTypes[i] == xbox::X_D3DRTYPE_CUBETEXTURE)
RC.PSTextureModes[i] = PS_TEXTUREMODES_CUBEMAP;
// Then adjust some texture mode according to the currently active textures, so that the shader will use the appropriate sampling method
switch (RC.PSTextureModes[i]) {
case PS_TEXTUREMODES_PROJECT2D:
case PS_TEXTUREMODES_PROJECT3D:
case PS_TEXTUREMODES_CUBEMAP:
if (ActiveTextureTypes[i] == xbox::X_D3DRTYPE_CUBETEXTURE)
RC.PSTextureModes[i] = PS_TEXTUREMODES_CUBEMAP;
else
if (ActiveTextureTypes[i] == xbox::X_D3DRTYPE_VOLUMETEXTURE)
// TODO : Also do this for DepthBuffers (but not EmuXBFormatIsLinear!) :
// || EmuXBFormatIsDepthBuffer(GetXboxPixelContainerFormat(g_pXbox_SetTexture[i])) in { X_D3DFMT_D24S8, X_D3DFMT_F24S8, X_D3DFMT_D16, X_D3DFMT_F16}
RC.PSTextureModes[i] = PS_TEXTUREMODES_PROJECT3D;
else else
RC.PSTextureModes[i] = PS_TEXTUREMODES_PROJECT2D; if (ActiveTextureTypes[i] == xbox::X_D3DRTYPE_VOLUMETEXTURE)
break; // TODO : Also do this for DepthBuffers (but not EmuXBFormatIsLinear!) :
case PS_TEXTUREMODES_DOT_STR_3D: // || EmuXBFormatIsDepthBuffer(GetXboxPixelContainerFormat(g_pXbox_SetTexture[i])) in { X_D3DFMT_D24S8, X_D3DFMT_F24S8, X_D3DFMT_D16, X_D3DFMT_F16}
case PS_TEXTUREMODES_DOT_STR_CUBE: RC.PSTextureModes[i] = PS_TEXTUREMODES_PROJECT3D;
if (ActiveTextureTypes[i] == xbox::X_D3DRTYPE_CUBETEXTURE) else
RC.PSTextureModes[i] = PS_TEXTUREMODES_DOT_STR_CUBE; RC.PSTextureModes[i] = PS_TEXTUREMODES_PROJECT2D;
else break;
RC.PSTextureModes[i] = PS_TEXTUREMODES_DOT_STR_3D; case PS_TEXTUREMODES_DOT_STR_3D:
break; case PS_TEXTUREMODES_DOT_STR_CUBE:
if (ActiveTextureTypes[i] == xbox::X_D3DRTYPE_CUBETEXTURE)
RC.PSTextureModes[i] = PS_TEXTUREMODES_DOT_STR_CUBE;
else
RC.PSTextureModes[i] = PS_TEXTUREMODES_DOT_STR_3D;
break;
}
/* Was :
switch (ActiveTextureTypes[i]) {
case xbox::X_D3DRTYPE_CUBETEXTURE:
switch (RC.PSTextureModes[i]) {
case PS_TEXTUREMODES_PROJECT2D: RC.PSTextureModes[i] = PS_TEXTUREMODES_CUBEMAP; break;
case PS_TEXTUREMODES_PROJECT3D: RC.PSTextureModes[i] = PS_TEXTUREMODES_CUBEMAP; break;
case PS_TEXTUREMODES_DOT_STR_3D: RC.PSTextureModes[i] = PS_TEXTUREMODES_DOT_STR_CUBE; break;
} break;
case xbox::X_D3DRTYPE_VOLUMETEXTURE:
switch (RC.PSTextureModes[i]) {
case PS_TEXTUREMODES_PROJECT2D: RC.PSTextureModes[i] = PS_TEXTUREMODES_PROJECT3D; break;
case PS_TEXTUREMODES_CUBEMAP: RC.PSTextureModes[i] = PS_TEXTUREMODES_PROJECT3D; break;
case PS_TEXTUREMODES_DOT_STR_CUBE: RC.PSTextureModes[i] = PS_TEXTUREMODES_DOT_STR_3D; break;
} break;
case xbox::X_D3DRTYPE_TEXTURE:
switch (RC.PSTextureModes[i]) {
case PS_TEXTUREMODES_PROJECT3D: RC.PSTextureModes[i] = PS_TEXTUREMODES_PROJECT2D; break;
case PS_TEXTUREMODES_CUBEMAP: RC.PSTextureModes[i] = PS_TEXTUREMODES_PROJECT2D; break;
} break;
case xbox::X_D3DRTYPE_NONE:
RC.PSTextureModes[i] = PS_TEXTUREMODES_NONE;
break;
}
*/
} }
/* Was : }
switch (ActiveTextureTypes[i]) { else {
case xbox::X_D3DRTYPE_CUBETEXTURE: // Texture modes were specified manually - but fix them up if necessary
switch (RC.PSTextureModes[i]) { for (int i = 0; i < xbox::X_D3DTS_STAGECOUNT; i++) {
case PS_TEXTUREMODES_PROJECT2D: RC.PSTextureModes[i] = PS_TEXTUREMODES_CUBEMAP; break; // Fixup sampling cube textures with PROJECT2D
case PS_TEXTUREMODES_PROJECT3D: RC.PSTextureModes[i] = PS_TEXTUREMODES_CUBEMAP; break; // Test case: Splinter Cell Chaos Theory (lighting)
case PS_TEXTUREMODES_DOT_STR_3D: RC.PSTextureModes[i] = PS_TEXTUREMODES_DOT_STR_CUBE; break; if (ActiveTextureTypes[i] == xbox::X_D3DRTYPE_CUBETEXTURE && RC.PSTextureModes[i] == PS_TEXTUREMODES_PROJECT2D) {
} break; EmuLog(LOG_LEVEL::WARNING, "PROJECT2D sampling is used with a cubemap texture - using CUBEMAP sampling instead");
case xbox::X_D3DRTYPE_VOLUMETEXTURE: RC.PSTextureModes[i] = PS_TEXTUREMODES_CUBEMAP;
switch (RC.PSTextureModes[i]) { }
case PS_TEXTUREMODES_PROJECT2D: RC.PSTextureModes[i] = PS_TEXTUREMODES_PROJECT3D; break;
case PS_TEXTUREMODES_CUBEMAP: RC.PSTextureModes[i] = PS_TEXTUREMODES_PROJECT3D; break;
case PS_TEXTUREMODES_DOT_STR_CUBE: RC.PSTextureModes[i] = PS_TEXTUREMODES_DOT_STR_3D; break;
} break;
case xbox::X_D3DRTYPE_TEXTURE:
switch (RC.PSTextureModes[i]) {
case PS_TEXTUREMODES_PROJECT3D: RC.PSTextureModes[i] = PS_TEXTUREMODES_PROJECT2D; break;
case PS_TEXTUREMODES_CUBEMAP: RC.PSTextureModes[i] = PS_TEXTUREMODES_PROJECT2D; break;
} break;
case xbox::X_D3DRTYPE_NONE:
RC.PSTextureModes[i] = PS_TEXTUREMODES_NONE;
break;
} }
*/
} }
} }