wined3d: Merge D3DPRIMITIVETYPE types into one type in WINED3D namespace.
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 @@ /***** * 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 @@ /* 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 @@ 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 @@ 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 @@ 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 @@ #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 @@ } } -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_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);