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

Disabled D3DVertexBuffer_GetDesc patch 

Added X_D3DVERTEXBUFFER_DESC and X_D3DINDEXBUFFER_DESC
Small cleanup
This commit is contained in:
PatrickvL 2017-04-21 18:06:10 +02:00 committed by Luke Usher
parent b88a837397
commit cd3d8795b2
9 changed files with 32 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/CxbxKrnl/EmuD3D8.cpp
View File

@ -3159,13 +3159,13 @@ XTL::X_D3DResource * WINAPI XTL::EMUPATCH(D3DDevice_CreateTexture2)
switch(D3DResource)
{
case 3: /*D3DRTYPE_TEXTURE*/
case X_D3DRTYPE_TEXTURE:
EMUPATCH(D3DDevice_CreateTexture)(Width, Height, Levels, Usage, Format, D3DPOOL_MANAGED, &pTexture);
break;
case 4: /*D3DRTYPE_VOLUMETEXTURE*/
case X_D3DRTYPE_VOLUMETEXTURE:
EMUPATCH(D3DDevice_CreateVolumeTexture)(Width, Height, Depth, Levels, Usage, Format, D3DPOOL_MANAGED, (X_D3DVolumeTexture**)&pTexture);
break;
case 5: /*D3DRTYPE_CUBETEXTURE*/
case X_D3DRTYPE_CUBETEXTURE:
//DbgPrintf( "D3DDevice_CreateTexture2: Width = 0x%X, Height = 0x%X\n", Width, Height );
//CxbxKrnlCleanup("Cube textures temporarily not supported!");
EMUPATCH(D3DDevice_CreateCubeTexture)(Width, Levels, Usage, Format, D3DPOOL_MANAGED, (X_D3DCubeTexture**) &pTexture);
@ -5321,10 +5321,6 @@ BOOL WINAPI XTL::EMUPATCH(D3DResource_IsBusy)
pThis);
//*/
IDirect3DResource8 *pResource8 = pThis->EmuResource8;
return FALSE;
}
@ -9326,13 +9322,14 @@ VOID WINAPI XTL::EMUPATCH(D3DResource_BlockUntilNotBusy)
return;
}
#if 0 // patch DISABLED
// ******************************************************************
// * patch: IDirect3DVertexBuffer8_GetDesc
// ******************************************************************
VOID WINAPI XTL::EMUPATCH(D3DVertexBuffer_GetDesc)
(
X_D3DVertexBuffer *pThis,
D3DVERTEXBUFFER_DESC *pDesc
X_D3DVERTEXBUFFER_DESC *pDesc
)
{
FUNC_EXPORTS
@ -9344,10 +9341,10 @@ VOID WINAPI XTL::EMUPATCH(D3DVertexBuffer_GetDesc)
");\n",
pThis, pDesc);
// TODO: Implement
pDesc->Format = X_D3DFMT_VERTEXDATA;
pDesc->Type = X_D3DRTYPE_VERTEXBUFFER;
}
#endif
// ******************************************************************
// * patch: D3DDevice_SetScissors

53
src/CxbxKrnl/EmuD3D8.h
View File

@ -1629,14 +1629,16 @@ VOID WINAPI EMUPATCH(D3DResource_BlockUntilNotBusy)
X_D3DResource *pThis
);
#if 0 // patch DISABLED
// ******************************************************************
// * patch: D3DVertexBuffer_GetDesc
// ******************************************************************
VOID WINAPI EMUPATCH(D3DVertexBuffer_GetDesc)
(
X_D3DVertexBuffer *pThis,
D3DVERTEXBUFFER_DESC *pDesc
X_D3DVERTEXBUFFER_DESC *pDesc
);
#endif
// ******************************************************************
// * patch: D3DDevice_SetScissors
@ -1657,46 +1659,6 @@ HRESULT WINAPI EMUPATCH(D3DDevice_SetScreenSpaceOffset)
FLOAT y
);
// ******************************************************************
// * patch: D3DDevice_InsertFence
// ******************************************************************
DWORD WINAPI EMUPATCH(D3DDevice_InsertFence)();
// ******************************************************************
// * patch: D3DDevice_BlockOnFence
// ******************************************************************
VOID WINAPI EMUPATCH(D3DDevice_BlockOnFence)
(
DWORD Fence
);
// ******************************************************************
// * patch: D3DResource_BlockUntilNotBusy
// ******************************************************************
VOID WINAPI EMUPATCH(D3DResource_BlockUntilNotBusy)
(
X_D3DResource *pThis
);
// ******************************************************************
// * patch: D3DVertexBuffer_GetDesc
// ******************************************************************
VOID WINAPI EMUPATCH(D3DVertexBuffer_GetDesc)
(
X_D3DVertexBuffer *pThis,
D3DVERTEXBUFFER_DESC *pDesc
);
// ******************************************************************
// * patch: D3DDevice_SetScissors
// ******************************************************************
HRESULT WINAPI EMUPATCH(D3DDevice_SetScissors)
(
DWORD Count,
BOOL Exclusive,
CONST D3DRECT *pRects
);
// ******************************************************************
// * patch: D3DDevice_SetPixelShaderProgram
// ******************************************************************
@ -1705,15 +1667,6 @@ HRESULT WINAPI EMUPATCH(D3DDevice_SetPixelShaderProgram)
X_D3DPIXELSHADERDEF *pPSDef
);
// ******************************************************************
// * patch: D3DDevice_SetScreenSpaceOffset
// ******************************************************************
HRESULT WINAPI EMUPATCH(D3DDevice_SetScreenSpaceOffset)
(
FLOAT x,
FLOAT y
);
// ******************************************************************
// * patch: D3DDevice_CreateStateBlock
// ******************************************************************

15
src/CxbxKrnl/EmuD3D8Types.h
View File

@ -260,6 +260,21 @@ typedef struct _X_D3DDISPLAYMODE
}
X_D3DDISPLAYMODE;
typedef struct _X_D3DVERTEXBUFFER_DESC
{
X_D3DFORMAT Format;
X_D3DRESOURCETYPE Type;
}
X_D3DVERTEXBUFFER_DESC;
typedef struct _X_D3DINDEXBUFFER_DESC
{
X_D3DFORMAT Format;
X_D3DRESOURCETYPE Type;
}
X_D3DINDEXBUFFER_DESC;
typedef struct _X_D3DSURFACE_DESC
{
X_D3DFORMAT Format;

2
src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl
View File

@ -3824,7 +3824,7 @@ OOVPATable D3D8_3925[] = {
REGISTER_OOVPA(D3DDevice_SwitchTexture, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_GetModelView, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_CopyRects, 3925, PATCH),
REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3925, PATCH),
REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3925, DISABLED),
REGISTER_OOVPA(D3DDevice_GetShaderConstantMode, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_GetVertexShader, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 3925, PATCH),

2
src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl
View File

@ -960,7 +960,7 @@ OOVPATable D3D8_5028[] = {
REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4361, PATCH),
REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4361, PATCH),
REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4627, PATCH),
REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 5028, PATCH),
REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 5028, DISABLED),
};
// ******************************************************************

2
src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl
View File

@ -704,7 +704,7 @@ OOVPATable D3D8_5233[] = {
REGISTER_OOVPA(D3DDevice_LightEnable, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 5028, PATCH),
REGISTER_OOVPA(D3DDevice_SetMaterial, 4627, PATCH),
REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 5233, PATCH),
REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 5233, DISABLED),
REGISTER_OOVPA(D3DVertexBuffer_Lock2, 4627, PATCH),
REGISTER_OOVPA(D3DResource_Register, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 5233, PATCH),

2
src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl
View File

@ -886,7 +886,7 @@ OOVPATable D3D8_5344[] = {
REGISTER_OOVPA(D3DDevice_LightEnable, 5344, PATCH), // Was 5233
REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 5028, PATCH),
REGISTER_OOVPA(D3DDevice_SetMaterial, 5344, PATCH), // Was 4627
REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 5233, PATCH),
REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 5233, DISABLED),
REGISTER_OOVPA(D3DVertexBuffer_Lock2, 4627, PATCH),
REGISTER_OOVPA(D3DResource_Register, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 5344, PATCH), // 5233

2
src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl
View File

@ -1432,7 +1432,7 @@ OOVPATable D3D8_5558[] = {
REGISTER_OOVPA(D3DDevice_BlockOnFence, 5233, PATCH),
REGISTER_OOVPA(D3D_BlockOnResource, 5558, XREF),
REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 5558, PATCH),
REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 5233, PATCH),
REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 5233, DISABLED),
REGISTER_OOVPA(D3DDevice_CopyRects, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_SetScissors, 5558, PATCH),
REGISTER_OOVPA(D3DDevice_SetScissors, 5344, PATCH),

2
src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl
View File

@ -1015,7 +1015,7 @@ OOVPATable D3D8_5788[] = {
REGISTER_OOVPA(D3DResource_IsBusy, 4361, PATCH),
REGISTER_OOVPA(D3D_BlockOnResource, 5558, XREF),
REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 5558, PATCH),
REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 5233, PATCH),
REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 5233, DISABLED),
REGISTER_OOVPA(D3DSurface_GetDesc, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_CopyRects, 5233, PATCH),
REGISTER_OOVPA(D3DPalette_Lock2, 4627, PATCH),