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

Remove patch for D3DDevice_GetTexture

This commit is contained in:
Luke Usher 2018-03-19 08:19:24 +00:00
parent 61fc3c5f76
commit a56c4af2ea
2 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/CxbxKrnl/EmuD3D.cpp.unused-patches
View File

@ -2604,3 +2604,39 @@ BYTE* WINAPI XTL::EMUPATCH(D3DVertexBuffer_Lock2)
RETURN(pRet);
}
// ******************************************************************
// * patch: D3DDevice_GetTexture2
// ******************************************************************
XTL::X_D3DBaseTexture* WINAPI XTL::EMUPATCH(D3DDevice_GetTexture2)(DWORD Stage)
{
FUNC_EXPORTS
LOG_FUNC_ONE_ARG(Stage);
// Get the active texture from this stage
X_D3DBaseTexture* pRet = EmuD3DActiveTexture[Stage];
if (pRet) {
pRet->Common++; // EMUPATCH(D3DResource_AddRef)(pRet);
}
return pRet;
}
// ******************************************************************
// * patch: D3DDevice_GetTexture
// ******************************************************************
VOID WINAPI XTL::EMUPATCH(D3DDevice_GetTexture)
(
DWORD Stage,
XTL::X_D3DBaseTexture **pTexture
)
{
FUNC_EXPORTS
LOG_FORWARD("D3DDevice_GetTexture2");
*pTexture = EMUPATCH(D3DDevice_GetTexture2)(Stage);
}

35
src/CxbxKrnl/EmuD3D8.cpp
View File

@ -7380,41 +7380,6 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_GetProjectionViewportMatrix)
}
#pragma warning(default:4244)
// ******************************************************************
// * patch: D3DDevice_GetTexture2
// ******************************************************************
XTL::X_D3DBaseTexture* WINAPI XTL::EMUPATCH(D3DDevice_GetTexture2)(DWORD Stage)
{
FUNC_EXPORTS
LOG_FUNC_ONE_ARG(Stage);
// Get the active texture from this stage
X_D3DBaseTexture* pRet = EmuD3DActiveTexture[Stage];
if (pRet) {
pRet->Common++; // EMUPATCH(D3DResource_AddRef)(pRet);
}
return pRet;
}
// ******************************************************************
// * patch: D3DDevice_GetTexture
// ******************************************************************
VOID WINAPI XTL::EMUPATCH(D3DDevice_GetTexture)
(
DWORD Stage,
XTL::X_D3DBaseTexture **pTexture
)
{
FUNC_EXPORTS
LOG_FORWARD("D3DDevice_GetTexture2");
*pTexture = EMUPATCH(D3DDevice_GetTexture2)(Stage);
}
// ******************************************************************
// * patch: D3DDevice_SetStateVB (D3D::CDevice::SetStateVB)
// ******************************************************************