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

Introduced Xbox version of X_D3DTRIPATCH_INFO, and required X_D3DBASISTYPE and X_D3DDEGREETYPE enums

This commit is contained in:
PatrickvL 2022-12-21 09:47:00 +01:00
parent d44d92e783
commit 6eb6665a42
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/hle/D3D8/Direct3D9/Direct3D9.cpp
View File

@ -9378,7 +9378,7 @@ xbox::hresult_xt WINAPI xbox::EMUPATCH(D3DDevice_DrawTriPatch)
(
uint_xt Handle,
CONST float_xt *pNumSegs,
CONST D3DTRIPATCH_INFO* pTriPatchInfo
CONST X_D3DTRIPATCH_INFO* pTriPatchInfo
)
{
LOG_FUNC_BEGIN

2
src/core/hle/D3D8/Direct3D9/Direct3D9.h
View File

@ -1878,7 +1878,7 @@ xbox::hresult_xt WINAPI EMUPATCH(D3DDevice_DrawTriPatch)
(
uint_xt Handle,
CONST float_xt *pNumSegs,
CONST D3DTRIPATCH_INFO* pTriPatchInfo
CONST X_D3DTRIPATCH_INFO* pTriPatchInfo
);
// ******************************************************************

30
src/core/hle/D3D8/XbD3D8Types.h
View File

@ -121,6 +121,13 @@ typedef enum _X_D3DBACKBUFFER_TYPE
X_D3DBACKBUFFER_TYPE_FORCE_DWORD = 0x7fffffff
} X_D3DBACKBUFFER_TYPE;
typedef enum _X_D3DBASISTYPE { // Based on Direct3D 9 TODO : verify on Xbox
D3DBASIS_BEZIER = 0,
D3DBASIS_BSPLINE = 1,
D3DBASIS_CATMULL_ROM = 2,
D3DBASIS_FORCE_DWORD = 0x7fffffff
} X_D3DBASISTYPE, *LPX_D3DBASISTYPE;
/* CubeMap Face identifiers */
typedef enum _X_D3DCUBEMAP_FACES
{
@ -134,6 +141,14 @@ typedef enum _X_D3DCUBEMAP_FACES
X_D3DCUBEMAP_FACE_FORCE_DWORD = 0x7fffffff
} X_D3DCUBEMAP_FACES;
typedef enum _X_D3DDEGREETYPE { // Based on Direct3D 9 TODO : verify on Xbox
D3DDEGREE_LINEAR = 1,
D3DDEGREE_QUADRATIC = 2,
D3DDEGREE_CUBIC = 3,
D3DDEGREE_QUINTIC = 5,
D3DCULL_FORCE_DWORD = 0x7fffffff
} X_D3DDEGREETYPE, *LPX_D3DDEGREETYPE;
typedef enum _X_D3DDEVTYPE
{
X_D3DDEVTYPE_HAL = 1,
@ -220,13 +235,24 @@ typedef struct _X_D3DRECTPATCH_INFO { // Based on Direct3D 9 TODO : verify on Xb
UINT Width;
UINT Height;
UINT Stride;
D3DBASISTYPE Basis;
D3DDEGREETYPE Degree;
X_D3DBASISTYPE Basis;
X_D3DDEGREETYPE Degree;
} X_D3DRECTPATCH_INFO, *LPX_D3DRECTPATCH_INFO;
#else
typedef D3DRECTPATCH_INFO X_D3DRECTPATCH_INFO;
#endif
#ifdef CXBX_USE_D3D11
typedef struct _X_D3DTRIPATCH_INFO { // Based on Direct3D 9 TODO : verify on Xbox
UINT StartVertexOffset;
UINT NumVertices;
X_D3DBASISTYPE Basis;
X_D3DDEGREETYPE Degree;
} X_D3DTRIPATCH_INFO, *LPX_D3DTRIPATCH_INFO;
#else
typedef D3DTRIPATCH_INFO X_D3DTRIPATCH_INFO;
#endif
typedef struct _X_D3DCOLORVALUE {
float r;
float g;