From 66f6a0c63363532c451ea88815b8918b62b20d34 Mon Sep 17 00:00:00 2001 From: Luke Usher Date: Sat, 18 Mar 2017 10:00:31 +0000 Subject: [PATCH] Fix broken signature --- src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl | 31 ---------------------- src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl | 1 - src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl | 1 - src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl | 3 +-- src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl | 1 - src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl | 1 - 6 files changed, 1 insertion(+), 37 deletions(-) diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl index 7ff5d7029..2afea5de2 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl @@ -1493,36 +1493,6 @@ OOVPA_NO_XREF(D3DDevice_DeletePixelShader, 4134, 7) { 0x1A, 0x00 }, OOVPA_END; -// ****************************************************************** -// * D3DDevice_SetRenderState_CullMode -// ****************************************************************** -OOVPA_XREF(D3DDevice_SetRenderState_CullMode, 4134, 13, - - XREF_DXSRSCULLMODE, - XRefZero) - - // D3DDevice_SetRenderState_CullMode+0x22 : mov dword ptr [eax], 0x40308 - { 0x22, 0xC7 }, // (Offset,Value)-Pair #1 - { 0x24, 0x08 }, // (Offset,Value)-Pair #2 - { 0x25, 0x03 }, // (Offset,Value)-Pair #3 - { 0x26, 0x04 }, // (Offset,Value)-Pair #4 - - // D3DDevice_SetRenderState_CullMode+0x2D : add eax, 8 - { 0x2D, 0x83 }, // (Offset,Value)-Pair #5 - { 0x2E, 0xC0 }, // (Offset,Value)-Pair #6 - { 0x2F, 0x08 }, // (Offset,Value)-Pair #7 - - // D3DDevice_SetRenderState_CullMode+0x39 : retn 4 - { 0x39, 0xC2 }, // (Offset,Value)-Pair #8 - { 0x3A, 0x04 }, // (Offset,Value)-Pair #9 - - // D3DDevice_SetRenderState_CullMode+0x5C : add edx, 0x404 - { 0x5C, 0x81 }, // (Offset,Value)-Pair #10 - { 0x5D, 0xC2 }, // (Offset,Value)-Pair #11 - { 0x5E, 0x04 }, // (Offset,Value)-Pair #12 - { 0x5F, 0x04 }, // (Offset,Value)-Pair #13 -OOVPA_END; - // ****************************************************************** // * D3DDevice_DeleteVertexShader // ****************************************************************** @@ -1996,7 +1966,6 @@ OOVPATable D3D8_4134[] = { REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4134, PATCH), REGISTER_OOVPA(D3DDevice_DeletePixelShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4134, PATCH), REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 4134, PATCH), REGISTER_OOVPA(D3D_SetFence, 4134, XREF), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl index 119fca73c..000760cac 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl @@ -1934,7 +1934,6 @@ OOVPATable D3D8_4361[] = { REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4134, PATCH), REGISTER_OOVPA(D3DDevice_DeletePixelShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4134, PATCH), REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3925, PATCH), REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 4134, PATCH), REGISTER_OOVPA(D3D_SetFence, 4134, XREF), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl index a61ceab9c..c409160b8 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl @@ -767,7 +767,6 @@ OOVPATable D3D8_4432[] { REGISTER_OOVPA(Get2DSurfaceDesc, 4361, PATCH), REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4134, PATCH), REGISTER_OOVPA(D3DDevice_DeletePixelShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4134, PATCH), REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3925, PATCH), REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 4134, PATCH), REGISTER_OOVPA(D3D_SetFence, 4134, XREF), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl index 7ed47ebde..2dc5a2e66 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl @@ -3192,8 +3192,7 @@ OOVPATable D3D8_4627[] = { REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4361, PATCH), REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH), +REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4432, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4361, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl index bd7fc9860..559352bf5 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl @@ -1264,7 +1264,6 @@ OOVPATable D3D8_5233[] = { REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4361, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 5233, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4432, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 5233, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3925, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl index dda5ad897..accfcce42 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl @@ -405,7 +405,6 @@ OOVPATable D3D8_5344[] = { REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4361, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 5233, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4134, DISABLED), REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4432, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 5233, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3925, PATCH),