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 shader constants: It's per-function not per-XDK

This commit is contained in:
Luke Usher 2019-07-18 22:20:55 +01:00
parent f9a3fde976
commit fdaa102dc8
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/core/hle/D3D8/Direct3D9/Direct3D9.cpp
View File

@ -3705,10 +3705,10 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_SetVertexShaderConstant)
LOG_FUNC_END; LOG_FUNC_END;
/*#ifdef _DEBUG_TRACK_VS_CONST /*#ifdef _DEBUG_TRACK_VS_CONST
for (uint32 i = 0; i < ConstantCount; i++) for (uint32_t i = 0; i < ConstantCount; i++)
{ {
printf("SetVertexShaderConstant, c%d (c%d) = { %f, %f, %f, %f }\n", printf("SetVertexShaderConstant, c%d = { %f, %f, %f, %f }\n",
Register - 96 + i, Register + i, Register + i,
*((float*)pConstantData + 4 * i), *((float*)pConstantData + 4 * i),
*((float*)pConstantData + 4 * i + 1), *((float*)pConstantData + 4 * i + 1),
*((float*)pConstantData + 4 * i + 2), *((float*)pConstantData + 4 * i + 2),
@ -3716,11 +3716,8 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_SetVertexShaderConstant)
} }
#endif*/ // _DEBUG_TRACK_VS_CONST #endif*/ // _DEBUG_TRACK_VS_CONST
// TODO: HACK: Since Xbox vertex shader constants range from -96 to 96, during conversion // Xbox vertex shader constants range from -96 to 96
// some shaders need to add 96 to use ranges 0 to 192. This fixes 3911 - 4361 games and XDK // The host does not support negative, so we adjust to 0-192
// samples, but breaks Turok.
// See D3DDevice_GetVertexShaderConstant
if(g_LibVersion_D3D8 <= 4361)
Register += 96; Register += 96;
HRESULT hRet; HRESULT hRet;
@ -3749,7 +3746,10 @@ VOID __fastcall XTL::EMUPATCH(D3DDevice_SetVertexShaderConstant1)
{ {
LOG_FORWARD("D3DDevice_SetVertexShaderConstant"); LOG_FORWARD("D3DDevice_SetVertexShaderConstant");
EMUPATCH(D3DDevice_SetVertexShaderConstant)(Register, pConstantData, 1); // The XDK uses a macro to automatically adjust to 0-192 range
// but D3DDevice_SetVertexShaderConstant expects -96-96 range
// so we adjust before forwarding
EMUPATCH(D3DDevice_SetVertexShaderConstant)(Register - 96, pConstantData, 1);
} }
// ****************************************************************** // ******************************************************************
@ -3763,9 +3763,10 @@ VOID __fastcall XTL::EMUPATCH(D3DDevice_SetVertexShaderConstant1Fast)
{ {
LOG_FORWARD("D3DDevice_SetVertexShaderConstant"); LOG_FORWARD("D3DDevice_SetVertexShaderConstant");
// Redirect to the standard version. // The XDK uses a macro to automatically adjust to 0-192 range
// but D3DDevice_SetVertexShaderConstant expects -96-96 range
EMUPATCH(D3DDevice_SetVertexShaderConstant)(Register, pConstantData, 1); // so we adjust before forwarding
EMUPATCH(D3DDevice_SetVertexShaderConstant)(Register - 96, pConstantData, 1);
} }
// ****************************************************************** // ******************************************************************
@ -3779,7 +3780,10 @@ VOID __fastcall XTL::EMUPATCH(D3DDevice_SetVertexShaderConstant4)
{ {
LOG_FORWARD("D3DDevice_SetVertexShaderConstant"); LOG_FORWARD("D3DDevice_SetVertexShaderConstant");
EMUPATCH(D3DDevice_SetVertexShaderConstant)(Register, pConstantData, 4); // The XDK uses a macro to automatically adjust to 0-192 range
// but D3DDevice_SetVertexShaderConstant expects -96-96 range
// so we adjust before forwarding
EMUPATCH(D3DDevice_SetVertexShaderConstant)(Register - 96, pConstantData, 4);
} }
// ****************************************************************** // ******************************************************************
@ -3794,7 +3798,10 @@ VOID __fastcall XTL::EMUPATCH(D3DDevice_SetVertexShaderConstantNotInline)
{ {
LOG_FORWARD("D3DDevice_SetVertexShaderConstant"); LOG_FORWARD("D3DDevice_SetVertexShaderConstant");
EMUPATCH(D3DDevice_SetVertexShaderConstant)(Register, pConstantData, ConstantCount / 4); // The XDK uses a macro to automatically adjust to 0-192 range
// but D3DDevice_SetVertexShaderConstant expects -96-96 range
// so we adjust before forwarding
EMUPATCH(D3DDevice_SetVertexShaderConstant)(Register - 96, pConstantData, ConstantCount / 4);
} }
// ****************************************************************** // ******************************************************************
@ -3809,9 +3816,10 @@ VOID __fastcall XTL::EMUPATCH(D3DDevice_SetVertexShaderConstantNotInlineFast)
{ {
LOG_FORWARD("D3DDevice_SetVertexShaderConstant"); LOG_FORWARD("D3DDevice_SetVertexShaderConstant");
// Redirect to the standard version. // The XDK uses a macro to automatically adjust to 0-192 range
// but D3DDevice_SetVertexShaderConstant expects -96-96 range
EMUPATCH(D3DDevice_SetVertexShaderConstant)(Register, pConstantData, ConstantCount / 4); // so we adjust before forwarding
EMUPATCH(D3DDevice_SetVertexShaderConstant)(Register - 96, pConstantData, ConstantCount / 4);
} }
// LTCG specific D3DDevice_SetTexture function... // LTCG specific D3DDevice_SetTexture function...
@ -8292,11 +8300,8 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_GetVertexShaderConstant)
LOG_FUNC_ARG(ConstantCount) LOG_FUNC_ARG(ConstantCount)
LOG_FUNC_END; LOG_FUNC_END;
// TODO: HACK: Since Xbox vertex shader constants range from -96 to 96, during conversion // Xbox vertex shader constants range from -96 to 96
// some shaders need to add 96 to use ranges 0 to 192. This fixes 3911 - 4361 games and XDK // The host does not support negative, so we adjust to 0-192
// samples, but breaks Turok.
// See D3DDevice_SetVertexShaderConstant
if (g_LibVersion_D3D8 <= 4361)
Register += 96; Register += 96;
HRESULT hRet = g_pD3DDevice->GetVertexShaderConstantF HRESULT hRet = g_pD3DDevice->GetVertexShaderConstantF
@ -9218,11 +9223,6 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_SetPixelShaderConstant_4)
// LOG_FUNC_END; // LOG_FUNC_END;
EmuLog(LOG_LEVEL::DEBUG, "D3DDevice_SetPixelShaderConstant_4(Register : %d pConstantData : %08X ConstantCount : %d);", Register, pConstantData, ConstantCount); EmuLog(LOG_LEVEL::DEBUG, "D3DDevice_SetPixelShaderConstant_4(Register : %d pConstantData : %08X ConstantCount : %d);", Register, pConstantData, ConstantCount);
// TODO: This hack is necessary for Vertex Shaders on XDKs prior to 4361, but if this
// causes problems with pixel shaders, feel free to comment out the hack below.
if(g_LibVersion_D3D8 <= 4361)
Register += 96;
HRESULT hRet = g_pD3DDevice->SetPixelShaderConstantF HRESULT hRet = g_pD3DDevice->SetPixelShaderConstantF
( (
Register, Register,