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

D3D9 : Further porting in PixelShader.cpp

This commit is contained in:
PatrickvL 2018-04-19 15:19:17 +02:00
parent db2e0e6aa2
commit fda56b8516
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4191,7 +4191,7 @@ static const
(
pFunction,
#ifdef CXBX_USE_D3D9
PIDirect3DPixelShader9(&(Result.ConvertedHandle)) {$MESSAGE 'fixme'}
(XTL::IDirect3DPixelShader9**)(&(Result.ConvertedHandle)) //fixme
#else
/*out*/&(Result.ConvertedHandle)
#endif
@ -4276,13 +4276,13 @@ VOID XTL::DxbxUpdateActivePixelShader() // NOPATCH
ConvertedPixelShaderHandle = RecompiledPixelShader->ConvertedHandle;
#ifdef CXBX_USE_D3D9
g_pD3DDevice.GetPixelShader(/*out*/PIDirect3DPixelShader9(&CurrentPixelShader));
g_pD3DDevice->GetPixelShader(/*out*/(IDirect3DPixelShader9**)(&CurrentPixelShader));
#else
g_pD3DDevice->GetPixelShader(/*out*/&CurrentPixelShader);
#endif
if (CurrentPixelShader != ConvertedPixelShaderHandle)
#ifdef CXBX_USE_D3D9
g_pD3DDevice->SetPixelShader((IDirect3DPixelShader9)ConvertedPixelShaderHandle);
g_pD3DDevice->SetPixelShader((IDirect3DPixelShader9*)ConvertedPixelShaderHandle);
#else
g_pD3DDevice->SetPixelShader(ConvertedPixelShaderHandle);
#endif
@ -4338,7 +4338,7 @@ VOID XTL::DxbxUpdateActivePixelShader() // NOPATCH
// TODO : Avoid the following setter if it's no different from the previous update (this might speed things up)
// Set the value locally in this register :
#ifdef CXBX_USE_D3D9
g_pD3DDevice.SetPixelShaderConstantF(Register_, PSingle(&fColor), 1);
g_pD3DDevice->SetPixelShaderConstantF(Register_, (float*)(&fColor), 1);
#else
g_pD3DDevice->SetPixelShaderConstant(Register_, &fColor, 1);
#endif
@ -4349,7 +4349,7 @@ VOID XTL::DxbxUpdateActivePixelShader() // NOPATCH
{
ConvertedPixelShaderHandle = 0;
#ifdef CXBX_USE_D3D9
g_pD3DDevice->SetPixelShader((IDirect3DPixelShader9)ConvertedPixelShaderHandle);
g_pD3DDevice->SetPixelShader((IDirect3DPixelShader9*)ConvertedPixelShaderHandle);
#else
g_pD3DDevice->SetPixelShader(ConvertedPixelShaderHandle);
#endif