From d44d92e783cb1185e6df489456b8427f1fa055d6 Mon Sep 17 00:00:00 2001 From: PatrickvL Date: Wed, 21 Dec 2022 09:40:46 +0100 Subject: [PATCH] Introduced Xbox version of X_D3DRECTPATCH_INFO --- src/core/hle/D3D8/Direct3D9/Direct3D9.cpp | 2 +- src/core/hle/D3D8/Direct3D9/Direct3D9.h | 2 +- src/core/hle/D3D8/XbD3D8Types.h | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp b/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp index b10729caa..db72ab8b1 100644 --- a/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp +++ b/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp @@ -9354,7 +9354,7 @@ xbox::hresult_xt WINAPI xbox::EMUPATCH(D3DDevice_DrawRectPatch) ( uint_xt Handle, CONST float_xt *pNumSegs, - CONST D3DRECTPATCH_INFO *pRectPatchInfo + CONST X_D3DRECTPATCH_INFO *pRectPatchInfo ) { LOG_FUNC_BEGIN diff --git a/src/core/hle/D3D8/Direct3D9/Direct3D9.h b/src/core/hle/D3D8/Direct3D9/Direct3D9.h index 85a9914f1..4a63f9158 100644 --- a/src/core/hle/D3D8/Direct3D9/Direct3D9.h +++ b/src/core/hle/D3D8/Direct3D9/Direct3D9.h @@ -1868,7 +1868,7 @@ xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_DrawRectPatch) ( uint_xt Handle, CONST float_xt *pNumSegs, - CONST D3DRECTPATCH_INFO *pRectPatchInfo + CONST X_D3DRECTPATCH_INFO *pRectPatchInfo ); // ****************************************************************** diff --git a/src/core/hle/D3D8/XbD3D8Types.h b/src/core/hle/D3D8/XbD3D8Types.h index ae864708e..8bef13ce3 100644 --- a/src/core/hle/D3D8/XbD3D8Types.h +++ b/src/core/hle/D3D8/XbD3D8Types.h @@ -213,6 +213,20 @@ typedef struct _X_D3DRECT { typedef D3DRECT X_D3DRECT; #endif +#ifdef CXBX_USE_D3D11 +typedef struct _X_D3DRECTPATCH_INFO { // Based on Direct3D 9 TODO : verify on Xbox + UINT StartVertexOffsetWidth; + UINT StartVertexOffsetHeight; + UINT Width; + UINT Height; + UINT Stride; + D3DBASISTYPE Basis; + D3DDEGREETYPE Degree; +} X_D3DRECTPATCH_INFO, *LPX_D3DRECTPATCH_INFO; +#else +typedef D3DRECTPATCH_INFO X_D3DRECTPATCH_INFO; +#endif + typedef struct _X_D3DCOLORVALUE { float r; float g;