Henri Verbeet : wined3d: Fix some prototypes.
Alexandre Julliard
julliard at winehq.org
Thu Mar 5 10:31:09 CST 2009
Module: wine
Branch: master
Commit: 17e12611b8efd6e6934e75a0a87f94f8483fa830
URL: http://source.winehq.org/git/wine.git/?a=commit;h=17e12611b8efd6e6934e75a0a87f94f8483fa830
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Mar 5 12:30:42 2009 +0100
wined3d: Fix some prototypes.
---
dlls/wined3d/drawprim.c | 16 ++++++++--------
dlls/wined3d/wined3d_private.h | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c
index af03f4e..9059ebb 100644
--- a/dlls/wined3d/drawprim.c
+++ b/dlls/wined3d/drawprim.c
@@ -238,7 +238,7 @@ void primitiveDeclarationConvertToStridedData(
}
static void drawStridedFast(IWineD3DDevice *iface, GLenum primitive_type,
- UINT min_vertex_idx, UINT max_vertex_idx, UINT count, short idx_size,
+ UINT min_vertex_idx, UINT max_vertex_idx, UINT count, UINT idx_size,
const void *idx_data, UINT start_idx)
{
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
@@ -274,12 +274,12 @@ static void drawStridedFast(IWineD3DDevice *iface, GLenum primitive_type,
*/
static void drawStridedSlow(IWineD3DDevice *iface, const WineDirect3DVertexStridedData *sd, UINT NumVertexes,
- GLenum glPrimType, const void *idxData, short idxSize, ULONG minIndex, ULONG startIdx)
+ GLenum glPrimType, const void *idxData, UINT idxSize, UINT minIndex, UINT startIdx)
{
unsigned int textureNo = 0;
const WORD *pIdxBufS = NULL;
const DWORD *pIdxBufL = NULL;
- ULONG vx_index;
+ UINT vx_index;
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
const UINT *streamOffset = This->stateBlock->streamOffset;
long SkipnStrides = startIdx + This->stateBlock->loadBaseVertexIndex;
@@ -594,13 +594,13 @@ static inline void send_attribute(IWineD3DDeviceImpl *This, const DWORD type, co
}
static void drawStridedSlowVs(IWineD3DDevice *iface, const WineDirect3DVertexStridedData *sd, UINT numberOfVertices,
- GLenum glPrimitiveType, const void *idxData, short idxSize, ULONG minIndex, ULONG startIdx)
+ GLenum glPrimitiveType, const void *idxData, UINT idxSize, UINT minIndex, UINT startIdx)
{
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface;
long SkipnStrides = startIdx + This->stateBlock->loadBaseVertexIndex;
const WORD *pIdxBufS = NULL;
const DWORD *pIdxBufL = NULL;
- ULONG vx_index;
+ UINT vx_index;
int i;
IWineD3DStateBlockImpl *stateblock = This->stateBlock;
const BYTE *ptr;
@@ -654,8 +654,8 @@ static void drawStridedSlowVs(IWineD3DDevice *iface, const WineDirect3DVertexStr
}
static inline void drawStridedInstanced(IWineD3DDevice *iface, const WineDirect3DVertexStridedData *sd,
- UINT numberOfVertices, GLenum glPrimitiveType, const void *idxData, short idxSize, ULONG minIndex,
- ULONG startIdx)
+ UINT numberOfVertices, GLenum glPrimitiveType, const void *idxData, UINT idxSize, UINT minIndex,
+ UINT startIdx)
{
UINT numInstances = 0, i;
int numInstancedAttribs = 0, j;
@@ -808,7 +808,7 @@ static inline void remove_vbos(IWineD3DDeviceImpl *This, WineDirect3DVertexStrid
/* Routine common to the draw primitive and draw indexed primitive routines */
void drawPrimitive(IWineD3DDevice *iface, WINED3DPRIMITIVETYPE PrimitiveType, UINT index_count,
- UINT numberOfVertices, long StartIdx, short idxSize, const void *idxData, int minIndex)
+ UINT numberOfVertices, UINT StartIdx, UINT idxSize, const void *idxData, UINT minIndex)
{
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 8f8fa82..b58d4ee 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -654,7 +654,7 @@ extern LONG primCounter;
/* Routine common to the draw primitive and draw indexed primitive routines */
void drawPrimitive(IWineD3DDevice *iface, WINED3DPRIMITIVETYPE PrimitiveType, UINT index_count,
- UINT numberOfVertices, long start_idx, short idxBytes, const void *idxData, int minIndex);
+ UINT numberOfVertices, UINT start_idx, UINT idxBytes, const void *idxData, UINT minIndex);
void primitiveDeclarationConvertToStridedData(
IWineD3DDevice *iface,
More information about the wine-cvs
mailing list