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

Allow merging this code by NOT switching over to new pixel shader code yet (it requires more work before this can be enabled).

This commit is contained in:
PatrickvL 2017-09-19 09:33:02 +02:00
parent 09872bf16d
commit 7cbdd7b430
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/CxbxKrnl/EmuD3D8.cpp
View File

@ -3716,22 +3716,17 @@ HRESULT WINAPI XTL::EMUPATCH(D3DDevice_CreatePixelShader)
LOG_FUNC_END; LOG_FUNC_END;
HRESULT hRet = E_FAIL; HRESULT hRet = E_FAIL;
DWORD* pFunction = NULL; #if 0 // PatrickvL Dxbx pixel shader translation
LPD3DXBUFFER pRecompiledBuffer = NULL;
// DWORD Handle = 0;
#if 1 // PatrickvL Dxbx pixel shader translation
pFunction = (DWORD*)pPSDef;
// Attempt to recompile PixelShader // Attempt to recompile PixelShader
hRet = DxbxUpdateActivePixelShader(pPSDef, pHandle); hRet = DxbxUpdateActivePixelShader(pPSDef, pHandle);
// redirect to windows d3d // redirect to windows d3d
DEBUG_D3DRESULT(hRet, "g_pD3DDevice8->CreatePixelShader"); DEBUG_D3DRESULT(hRet, "g_pD3DDevice8->CreatePixelShader");
#endif #endif
#if 1 // Kingofc's pixel shader translation
DWORD* pFunction = NULL;
LPD3DXBUFFER pRecompiledBuffer = NULL;
#if 0 // Kingofc's pixel shader translation
hRet = CreatePixelShaderFunction(pPSDef, &pRecompiledBuffer); hRet = CreatePixelShaderFunction(pPSDef, &pRecompiledBuffer);
DEBUG_D3DRESULT(hRet, "CreatePixelShaderFunction"); DEBUG_D3DRESULT(hRet, "CreatePixelShaderFunction");
@ -3762,14 +3757,15 @@ HRESULT WINAPI XTL::EMUPATCH(D3DDevice_CreatePixelShader)
memcpy(&pPixelShader->PSDef, pPSDef, sizeof(X_D3DPIXELSHADERDEF)); memcpy(&pPixelShader->PSDef, pPSDef, sizeof(X_D3DPIXELSHADERDEF));
DWORD Handle = 0; // ??
pPixelShader->Handle = Handle; pPixelShader->Handle = Handle;
pPixelShader->dwStatus = hRet; pPixelShader->dwStatus = hRet;
*pHandle = (DWORD)pPixelShader; *pHandle = (DWORD)pPixelShader;
*/ */
#endif #endif
#if 0 // Older Cxbx pixel shader translation #if 0 // Older Cxbx pixel shader translation
// ================================================================ DWORD* pFunction = NULL;
pFunction = (DWORD*) pPSDef; pFunction = (DWORD*) pPSDef;
// Attempt to recompile PixelShader // Attempt to recompile PixelShader
@ -3782,8 +3778,6 @@ HRESULT WINAPI XTL::EMUPATCH(D3DDevice_CreatePixelShader)
pHandle pHandle
); );
DEBUG_D3DRESULT(hRet, "g_pD3DDevice8->CreatePixelShader"); DEBUG_D3DRESULT(hRet, "g_pD3DDevice8->CreatePixelShader");
// ================================================================
#endif #endif
if(FAILED(hRet)) if(FAILED(hRet))

2
src/CxbxKrnl/EmuD3D8/PixelShader.cpp
View File

@ -2138,7 +2138,7 @@ std::string PSH_XBOX_SHADER::DecodedToString(XTL::X_D3DPIXELSHADERDEF *pPSDef)
_AddStr(DxbxFormat(aStr, Args)); \ _AddStr(DxbxFormat(aStr, Args)); \
} }
{ {
int i; // int i;
std::string Result = ""; std::string Result = "";
// Show the contents to the user // Show the contents to the user