From 1bb692e0677f3fca5f80826a4440c6fb4aba7bab Mon Sep 17 00:00:00 2001 From: PatrickvL Date: Wed, 21 Dec 2022 09:40:28 +0100 Subject: [PATCH] Introduced Xbox version of X_D3DSTATEBLOCKTYPE (unused) --- src/core/hle/D3D8/Direct3D9/Direct3D9.cpp.unused-patches | 2 +- src/core/hle/D3D8/Direct3D9/Direct3D9.h | 4 +++- src/core/hle/D3D8/XbD3D8Types.h | 7 +++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp.unused-patches b/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp.unused-patches index 1b7d3d1ee..a1d4e7464 100644 --- a/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp.unused-patches +++ b/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp.unused-patches @@ -2362,7 +2362,7 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_SetPixelShaderProgram) // ****************************************************************** HRESULT WINAPI XTL::EMUPATCH(D3DDevice_CreateStateBlock) ( - D3DSTATEBLOCKTYPE Type, + X_D3DSTATEBLOCKTYPE Type, DWORD *pToken ) { diff --git a/src/core/hle/D3D8/Direct3D9/Direct3D9.h b/src/core/hle/D3D8/Direct3D9/Direct3D9.h index 53ecdfb7b..85a9914f1 100644 --- a/src/core/hle/D3D8/Direct3D9/Direct3D9.h +++ b/src/core/hle/D3D8/Direct3D9/Direct3D9.h @@ -1840,14 +1840,16 @@ xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetPixelShaderProgram) X_D3DPIXELSHADERDEF *pPSDef ); +#if 0 // patch DISABLED // ****************************************************************** // * patch: D3DDevice_CreateStateBlock // ****************************************************************** xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_CreateStateBlock) ( - D3DSTATEBLOCKTYPE Type, + X_D3DSTATEBLOCKTYPE Type, dword_xt *pToken ); +#endif // ****************************************************************** // * patch: D3DDevice_InsertCallback diff --git a/src/core/hle/D3D8/XbD3D8Types.h b/src/core/hle/D3D8/XbD3D8Types.h index b6e73bdad..ae864708e 100644 --- a/src/core/hle/D3D8/XbD3D8Types.h +++ b/src/core/hle/D3D8/XbD3D8Types.h @@ -260,6 +260,13 @@ typedef struct _X_D3DVIEWPORT8 { float MaxZ; } X_D3DVIEWPORT8; +typedef enum _X_D3DSTATEBLOCKTYPE { // Based on Direct3D 9 TODO : verify on Xbox + D3DSBT_ALL = 1, + D3DSBT_PIXELSTATE = 2, + D3DSBT_VERTEXSTATE = 3, + D3DSBT_FORCE_DWORD = 0x7fffffff +} X_D3DSTATEBLOCKTYPE; + /* SwapEffects */ typedef enum _X_D3DSWAPEFFECT {