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

Renamed p(b)Data variables into p(b)NativeData where applicable 

Also corrected D3DVertexBuffer_Lock2 ppVertexBuffer name into
pVertexBuffer
This commit is contained in:
PatrickvL 2017-04-21 09:53:47 +02:00 committed by Luke Usher
parent 30494a71d3
commit 1eb79878ac
2 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/CxbxKrnl/EmuD3D8.cpp
View File

@ -3461,11 +3461,14 @@ HRESULT WINAPI XTL::EMUPATCH(D3DDevice_CreateIndexBuffer)
// update data ptr // update data ptr
{ {
BYTE *pData = NULL; BYTE *pNativeData = nullptr;
(*ppIndexBuffer)->EmuIndexBuffer8->Lock(0, Length, &pData, NULL); hRet = (*ppIndexBuffer)->EmuIndexBuffer8->Lock(/*OffsetToLock=*/0, Length, &pNativeData, /*Flags=*/0);
if(FAILED(hRet))
CxbxKrnlCleanup("IndexBuffer Lock Failed!\n\nError: \nDesc: "/*,
DXGetErrorString8A(hRet)*//*, DXGetErrorDescription8A(hRet)*/);
(*ppIndexBuffer)->Data = (DWORD)pData; (*ppIndexBuffer)->Data = (DWORD)pNativeData; // For now, give the native buffer memory to Xbox. TODO : g_MemoryManager.AllocateContiguous
} }
return hRet; return hRet;
@ -3543,7 +3546,9 @@ HRESULT WINAPI XTL::EMUPATCH(D3DDevice_SetIndices)
IDirect3DIndexBuffer8 *pIndexBuffer = pIndexData->EmuIndexBuffer8; IDirect3DIndexBuffer8 *pIndexBuffer = pIndexData->EmuIndexBuffer8;
if(pIndexData->Lock != X_D3DRESOURCE_LOCK_FLAG_NOSIZE) if (pIndexData->Lock == X_D3DRESOURCE_LOCK_FLAG_NOSIZE)
; // this should have been prevented by EmuVerifyResourceIsRegistered
else
hRet = g_pD3DDevice8->SetIndices(pIndexBuffer, BaseVertexIndex); hRet = g_pD3DDevice8->SetIndices(pIndexBuffer, BaseVertexIndex);
} }
else else
@ -4450,21 +4455,22 @@ HRESULT WINAPI XTL::EMUPATCH(D3DResource_Register)
g_VBTrackTotal.insert(pResource->EmuVertexBuffer8); g_VBTrackTotal.insert(pResource->EmuVertexBuffer8);
#endif #endif
BYTE *pData = NULL; BYTE *pNativeData = nullptr;
hRet = pResource->EmuVertexBuffer8->Lock(0, 0, &pData, 0);
hRet = pResource->EmuVertexBuffer8->Lock(
/*OffsetToLock=*/0,
/*SizeToLock=*/0/*=entire buffer*/,
&pNativeData,
/*Flags=*/0);
if(FAILED(hRet)) if(FAILED(hRet))
CxbxKrnlCleanup("VertexBuffer Lock Failed!\n\nError: \nDesc: "/*, CxbxKrnlCleanup("VertexBuffer Lock Failed!\n\nError: \nDesc: "/*,
DXGetErrorString8A(hRet)*//*, DXGetErrorDescription8A(hRet)*/); DXGetErrorString8A(hRet)*//*, DXGetErrorDescription8A(hRet)*/);
memcpy(pData, (void*)pBase, dwSize);
memcpy(pNativeData, (void*)pBase, dwSize);
pResource->EmuVertexBuffer8->Unlock(); pResource->EmuVertexBuffer8->Unlock();
pResource->Data = (DWORD)pData; pResource->Data = (DWORD)pNativeData; // For now, give the native buffer memory to Xbox. TODO : g_MemoryManager.AllocateContiguous
} }
DbgPrintf("EmuIDirect3DResource8_Register : Successfully Created VertexBuffer (0x%.08X)\n", pResource->EmuVertexBuffer8); DbgPrintf("EmuIDirect3DResource8_Register : Successfully Created VertexBuffer (0x%.08X)\n", pResource->EmuVertexBuffer8);
} }
@ -4496,26 +4502,21 @@ HRESULT WINAPI XTL::EMUPATCH(D3DResource_Register)
dwSize, /*Usage=*/0, D3DFMT_INDEX16, D3DPOOL_MANAGED, dwSize, /*Usage=*/0, D3DFMT_INDEX16, D3DPOOL_MANAGED,
&pIndexBuffer->EmuIndexBuffer8 &pIndexBuffer->EmuIndexBuffer8
); );
if(FAILED(hRet)) if(FAILED(hRet))
CxbxKrnlCleanup("CreateIndexBuffer Failed!\n\nError: \nDesc: \nSize: %d", CxbxKrnlCleanup("CreateIndexBuffer Failed!\n\nError: \nDesc: \nSize: %d",
/*DXGetErrorString8A(hRet), *//*DXGetErrorDescription8A(hRet),*/ dwSize); /*DXGetErrorString8A(hRet), *//*DXGetErrorDescription8A(hRet),*/ dwSize);
BYTE *pNativeData = nullptr;
BYTE *pData = NULL; hRet = pResource->EmuIndexBuffer8->Lock(/*OffsetToLock=*/0, dwSize, &pNativeData, /*Flags*/0);
hRet = pResource->EmuIndexBuffer8->Lock(0, dwSize, &pData, 0);
if(FAILED(hRet)) if(FAILED(hRet))
CxbxKrnlCleanup("IndexBuffer Lock Failed!\n\nError: %s\nDesc: "/*, CxbxKrnlCleanup("IndexBuffer Lock Failed!\n\nError: %s\nDesc: "/*,
DXGetErrorString8A(hRet)*//*, DXGetErrorDescription8A(hRet)*/); DXGetErrorString8A(hRet)*//*, DXGetErrorDescription8A(hRet)*/);
memcpy(pData, (void*)pBase, dwSize);
memcpy(pNativeData, (void*)pBase, dwSize);
pResource->EmuIndexBuffer8->Unlock(); pResource->EmuIndexBuffer8->Unlock();
pResource->Data = (DWORD)pData; pResource->Data = (DWORD)pNativeData; // For now, give the native buffer memory to Xbox. TODO : Use pBase
} }
DbgPrintf("EmuIDirect3DResource8_Register : Successfully Created IndexBuffer (0x%.08X)\n", pResource->EmuIndexBuffer8); DbgPrintf("EmuIDirect3DResource8_Register : Successfully Created IndexBuffer (0x%.08X)\n", pResource->EmuIndexBuffer8);
@ -7401,7 +7402,7 @@ HRESULT WINAPI XTL::EMUPATCH(D3DDevice_GetTransform)
// ****************************************************************** // ******************************************************************
VOID WINAPI XTL::EMUPATCH(D3DVertexBuffer_Lock) VOID WINAPI XTL::EMUPATCH(D3DVertexBuffer_Lock)
( (
X_D3DVertexBuffer *ppVertexBuffer, X_D3DVertexBuffer *pVertexBuffer,
UINT OffsetToLock, UINT OffsetToLock,
UINT SizeToLock, UINT SizeToLock,
BYTE **ppbData, BYTE **ppbData,
@ -7449,28 +7450,31 @@ BYTE* WINAPI XTL::EMUPATCH(D3DVertexBuffer_Lock2)
" ppVertexBuffer : 0x%.08X\n" " ppVertexBuffer : 0x%.08X\n"
" Flags : 0x%.08X\n" " Flags : 0x%.08X\n"
");\n", ");\n",
ppVertexBuffer, Flags); pVertexBuffer, Flags);
IDirect3DVertexBuffer8 *pVertexBuffer8 = NULL;
EmuVerifyResourceIsRegistered(ppVertexBuffer); EmuVerifyResourceIsRegistered(pVertexBuffer);
BYTE *pbData = NULL; BYTE *pbNativeData = NULL;
HRESULT hRet = S_OK; HRESULT hRet = S_OK;
if( ppVertexBuffer->EmuVertexBuffer8 ) IDirect3DVertexBuffer8 *pVertexBuffer8 = pVertexBuffer->EmuVertexBuffer8;
if (pVertexBuffer8 == nullptr)
EmuWarning("ppVertexBuffer->EmuVertexBuffer8 == nullptr!");
else
{ {
pVertexBuffer8 = ppVertexBuffer->EmuVertexBuffer8; hRet = pVertexBuffer8->Lock(
hRet = pVertexBuffer8->Lock(0, 0, &pbData, EmuXB2PC_D3DLock(Flags)); // Fixed flags check, Battlestar Galactica now displays graphics correctly /*OffsetToLock=*/0,
/*SizeToLock=*/0/*=entire buffer*/,
&pbNativeData,
EmuXB2PC_D3DLock(Flags) // Fixed flags check, Battlestar Galactica now displays graphics correctly
);
if( FAILED( hRet ) ) if( FAILED( hRet ) )
EmuWarning("Lock vertex buffer failed!"); EmuWarning("Lock vertex buffer failed!");
} }
else
EmuWarning("ppVertexBuffer->EmuVertexBuffer8 == nullptr!");
return pbData; return pbNativeData; // For now, give the native buffer memory to Xbox. TODO : pVertexBuffer->Data
} }
// ****************************************************************** // ******************************************************************

2
src/CxbxKrnl/EmuD3D8.h
View File

@ -1220,7 +1220,7 @@ VOID WINAPI EMUPATCH(D3DVertexBuffer_Lock)
// ****************************************************************** // ******************************************************************
BYTE* WINAPI EMUPATCH(D3DVertexBuffer_Lock2) BYTE* WINAPI EMUPATCH(D3DVertexBuffer_Lock2)
( (
X_D3DVertexBuffer *ppVertexBuffer, X_D3DVertexBuffer *pVertexBuffer,
DWORD Flags DWORD Flags
); );