[WINED3D 6/7] Merge D3DPRIMITIVETYPE types into one type in WINED3D
namespace
Ivan Gyurdiev
ivg231 at gmail.com
Thu Oct 12 01:23:55 CDT 2006
This is the last dependency of wined3d_interfaces.h on d3d(7,8,9).
-------------- next part --------------
---
dlls/wined3d/device.c | 10 +++++-----
dlls/wined3d/drawprim.c | 14 +++++++-------
dlls/wined3d/utils.c | 16 ++++++++--------
dlls/wined3d/wined3d_private.h | 2 +-
include/wine/wined3d_interface.h | 14 +++++---------
include/wine/wined3d_types.h | 11 +++++++++++
6 files changed, 37 insertions(+), 30 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 748dbef..83e9a83 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -6141,7 +6141,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl
/*****
* Drawing functions
*****/
-static HRESULT WINAPI IWineD3DDeviceImpl_DrawPrimitive(IWineD3DDevice *iface, D3DPRIMITIVETYPE PrimitiveType, UINT StartVertex,
+static HRESULT WINAPI IWineD3DDeviceImpl_DrawPrimitive(IWineD3DDevice *iface, WINED3DPRIMITIVETYPE PrimitiveType, UINT StartVertex,
UINT PrimitiveCount) {
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
@@ -6159,7 +6159,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl
/* TODO: baseVIndex needs to be provided from This->stateBlock->baseVertexIndex when called from d3d8 */
static HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitive(IWineD3DDevice *iface,
- D3DPRIMITIVETYPE PrimitiveType,
+ WINED3DPRIMITIVETYPE PrimitiveType,
INT baseVIndex, UINT minIndex,
UINT NumVertices, UINT startIndex, UINT primCount) {
@@ -6188,7 +6188,7 @@ static HRESULT WINAPI IWineD3DDeviceIm
return WINED3D_OK;
}
-static HRESULT WINAPI IWineD3DDeviceImpl_DrawPrimitiveUP(IWineD3DDevice *iface, D3DPRIMITIVETYPE PrimitiveType,
+static HRESULT WINAPI IWineD3DDeviceImpl_DrawPrimitiveUP(IWineD3DDevice *iface, WINED3DPRIMITIVETYPE PrimitiveType,
UINT PrimitiveCount, CONST void* pVertexStreamZeroData,
UINT VertexStreamZeroStride) {
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
@@ -6218,7 +6218,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl
return WINED3D_OK;
}
-static HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitiveUP(IWineD3DDevice *iface, D3DPRIMITIVETYPE PrimitiveType,
+static HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitiveUP(IWineD3DDevice *iface, WINED3DPRIMITIVETYPE PrimitiveType,
UINT MinVertexIndex, UINT NumVertices,
UINT PrimitiveCount, CONST void* pIndexData,
WINED3DFORMAT IndexDataFormat,CONST void* pVertexStreamZeroData,
@@ -6260,7 +6260,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl
return WINED3D_OK;
}
-static HRESULT WINAPI IWineD3DDeviceImpl_DrawPrimitiveStrided (IWineD3DDevice *iface, D3DPRIMITIVETYPE PrimitiveType, UINT PrimitiveCount, WineDirect3DVertexStridedData *DrawPrimStrideData) {
+static HRESULT WINAPI IWineD3DDeviceImpl_DrawPrimitiveStrided (IWineD3DDevice *iface, WINED3DPRIMITIVETYPE PrimitiveType, UINT PrimitiveCount, WineDirect3DVertexStridedData *DrawPrimStrideData) {
drawPrimitive(iface, PrimitiveType, PrimitiveCount, 0, 0, 0, 0, NULL, 0, DrawPrimStrideData);
return WINED3D_OK;
diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c
index c0e0533..ffde5d2 100644
--- a/dlls/wined3d/drawprim.c
+++ b/dlls/wined3d/drawprim.c
@@ -39,44 +39,44 @@ #undef GL_VERSION_1_4 /* To be fixed, ca
#endif
/* Issues the glBegin call for gl given the primitive type and count */
-static DWORD primitiveToGl(D3DPRIMITIVETYPE PrimitiveType,
+static DWORD primitiveToGl(WINED3DPRIMITIVETYPE PrimitiveType,
DWORD NumPrimitives,
GLenum *primType)
{
DWORD NumVertexes = NumPrimitives;
switch (PrimitiveType) {
- case D3DPT_POINTLIST:
+ case WINED3DPT_POINTLIST:
TRACE("POINTS\n");
*primType = GL_POINTS;
NumVertexes = NumPrimitives;
break;
- case D3DPT_LINELIST:
+ case WINED3DPT_LINELIST:
TRACE("LINES\n");
*primType = GL_LINES;
NumVertexes = NumPrimitives * 2;
break;
- case D3DPT_LINESTRIP:
+ case WINED3DPT_LINESTRIP:
TRACE("LINE_STRIP\n");
*primType = GL_LINE_STRIP;
NumVertexes = NumPrimitives + 1;
break;
- case D3DPT_TRIANGLELIST:
+ case WINED3DPT_TRIANGLELIST:
TRACE("TRIANGLES\n");
*primType = GL_TRIANGLES;
NumVertexes = NumPrimitives * 3;
break;
- case D3DPT_TRIANGLESTRIP:
+ case WINED3DPT_TRIANGLESTRIP:
TRACE("TRIANGLE_STRIP\n");
*primType = GL_TRIANGLE_STRIP;
NumVertexes = NumPrimitives + 2;
break;
- case D3DPT_TRIANGLEFAN:
+ case WINED3DPT_TRIANGLEFAN:
TRACE("TRIANGLE_FAN\n");
*primType = GL_TRIANGLE_FAN;
NumVertexes = NumPrimitives + 2;
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index ce3bebc..a810e77 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -355,18 +355,18 @@ #undef RES_TO_STR
}
}
-const char* debug_d3dprimitivetype(D3DPRIMITIVETYPE PrimitiveType) {
+const char* debug_d3dprimitivetype(WINED3DPRIMITIVETYPE PrimitiveType) {
switch (PrimitiveType) {
#define PRIM_TO_STR(prim) case prim: return #prim;
- PRIM_TO_STR(D3DPT_POINTLIST);
- PRIM_TO_STR(D3DPT_LINELIST);
- PRIM_TO_STR(D3DPT_LINESTRIP);
- PRIM_TO_STR(D3DPT_TRIANGLELIST);
- PRIM_TO_STR(D3DPT_TRIANGLESTRIP);
- PRIM_TO_STR(D3DPT_TRIANGLEFAN);
+ PRIM_TO_STR(WINED3DPT_POINTLIST);
+ PRIM_TO_STR(WINED3DPT_LINELIST);
+ PRIM_TO_STR(WINED3DPT_LINESTRIP);
+ PRIM_TO_STR(WINED3DPT_TRIANGLELIST);
+ PRIM_TO_STR(WINED3DPT_TRIANGLESTRIP);
+ PRIM_TO_STR(WINED3DPT_TRIANGLEFAN);
#undef PRIM_TO_STR
default:
- FIXME("Unrecognized %u D3DPRIMITIVETYPE!\n", PrimitiveType);
+ FIXME("Unrecognized %u WINED3DPRIMITIVETYPE!\n", PrimitiveType);
return "unrecognized";
}
}
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index b013382..8d129bd 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1252,7 +1252,7 @@ const char* debug_d3dusagequery(DWORD us
const char* debug_d3ddeclmethod(WINED3DDECLMETHOD method);
const char* debug_d3ddecltype(WINED3DDECLTYPE type);
const char* debug_d3ddeclusage(BYTE usage);
-const char* debug_d3dprimitivetype(D3DPRIMITIVETYPE PrimitiveType);
+const char* debug_d3dprimitivetype(WINED3DPRIMITIVETYPE PrimitiveType);
const char* debug_d3drenderstate(DWORD state);
const char* debug_d3dsamplerstate(DWORD state);
const char* debug_d3dtexturestate(DWORD state);
diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h
index 60c2334..1b711a8 100644
--- a/include/wine/wined3d_interface.h
+++ b/include/wine/wined3d_interface.h
@@ -28,10 +28,6 @@ #if !defined( __WINE_CONFIG_H )
# error You must include config.h to use this header
#endif
-#if !defined( __WINE_D3D_H ) && !defined( __WINE_D3D8_H ) && !defined( __WINE_D3D9_H )
-# error You must include d3d.h, d3d8.h or d3d9.h header to use this header
-#endif
-
#if !defined( __WINE_DDRAW_H)
#error You must include ddraw.h to use this header
#endif
@@ -448,11 +444,11 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD
STDMETHOD(EndScene)(THIS) PURE;
STDMETHOD(Present)(THIS_ CONST RECT * pSourceRect,CONST RECT * pDestRect,HWND hDestWindowOverride,CONST RGNDATA * pDirtyRegion) PURE;
STDMETHOD(Clear)(THIS_ DWORD Count, CONST WINED3DRECT * pRects, DWORD Flags, WINED3DCOLOR Color, float Z, DWORD Stencil) PURE;
- STDMETHOD(DrawPrimitive)(THIS_ D3DPRIMITIVETYPE PrimitiveType,UINT StartVertex,UINT PrimitiveCount) PURE;
- STDMETHOD(DrawIndexedPrimitive)(THIS_ D3DPRIMITIVETYPE PrimitiveType,INT baseVIdx, UINT minIndex,UINT NumVertices,UINT startIndex,UINT primCount) PURE;
- STDMETHOD(DrawPrimitiveUP)(THIS_ D3DPRIMITIVETYPE PrimitiveType,UINT PrimitiveCount,CONST void * pVertexStreamZeroData,UINT VertexStreamZeroStride) PURE;
- STDMETHOD(DrawIndexedPrimitiveUP)(THIS_ D3DPRIMITIVETYPE PrimitiveType,UINT MinVertexIndex,UINT NumVertexIndices,UINT PrimitiveCount,CONST void * pIndexData,WINED3DFORMAT IndexDataFormat,CONST void * pVertexStreamZeroData,UINT VertexStreamZeroStride) PURE;
- STDMETHOD(DrawPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE PrimitiveType, UINT PrimitiveCount, WineDirect3DVertexStridedData *DrawPrimStrideData) PURE;
+ STDMETHOD(DrawPrimitive)(THIS_ WINED3DPRIMITIVETYPE PrimitiveType, UINT StartVertex, UINT PrimitiveCount) PURE;
+ STDMETHOD(DrawIndexedPrimitive)(THIS_ WINED3DPRIMITIVETYPE PrimitiveType, INT baseVIdx, UINT minIndex, UINT NumVertices, UINT startIndex, UINT primCount) PURE;
+ STDMETHOD(DrawPrimitiveUP)(THIS_ WINED3DPRIMITIVETYPE PrimitiveType, UINT PrimitiveCount, CONST void * pVertexStreamZeroData, UINT VertexStreamZeroStride) PURE;
+ STDMETHOD(DrawIndexedPrimitiveUP)(THIS_ WINED3DPRIMITIVETYPE PrimitiveType, UINT MinVertexIndex, UINT NumVertexIndices, UINT PrimitiveCount, CONST void * pIndexData, WINED3DFORMAT IndexDataFormat, CONST void * pVertexStreamZeroData, UINT VertexStreamZeroStride) PURE;
+ STDMETHOD(DrawPrimitiveStrided)(THIS_ WINED3DPRIMITIVETYPE PrimitiveType, UINT PrimitiveCount, WineDirect3DVertexStridedData *DrawPrimStrideData) PURE;
STDMETHOD(DrawRectPatch)(THIS_ UINT Handle, CONST float* pNumSegs, CONST WINED3DRECTPATCH_INFO* pRectPatchInfo) PURE;
STDMETHOD(DrawTriPatch)(THIS_ UINT Handle, CONST float* pNumSegs, CONST WINED3DTRIPATCH_INFO* pTriPatchInfo) PURE;
STDMETHOD(DeletePatch)(THIS_ UINT Handle) PURE;
diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h
index b930211..48120e4 100644
--- a/include/wine/wined3d_types.h
+++ b/include/wine/wined3d_types.h
@@ -41,6 +41,17 @@ typedef enum _WINED3DLIGHTTYPE {
WINED3DLIGHT_FORCE_DWORD = 0x7fffffff
} WINED3DLIGHTTYPE;
+typedef enum _WINED3DPRIMITIVETYPE {
+ WINED3DPT_POINTLIST = 1,
+ WINED3DPT_LINELIST = 2,
+ WINED3DPT_LINESTRIP = 3,
+ WINED3DPT_TRIANGLELIST = 4,
+ WINED3DPT_TRIANGLESTRIP = 5,
+ WINED3DPT_TRIANGLEFAN = 6,
+
+ WINED3DPT_FORCE_DWORD = 0x7fffffff
+} WINED3DPRIMITIVETYPE;
+
typedef struct _WINED3DCOLORVALUE {
float r;
float g;
--
1.4.2.1
More information about the wine-patches
mailing list