ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Explicitly pass the context to drawStridedSlow().

This commit is contained in:
Henri Verbeet 2009-08-07 08:51:19 +02:00 committed by Alexandre Julliard
parent 3bf0ad4528
commit 0479fb13b5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/wined3d/drawprim.c
View File

@ -70,10 +70,10 @@ static void drawStridedFast(IWineD3DDevice *iface, GLenum primitive_type,
*/ */
/* GL locking is done by the caller */ /* GL locking is done by the caller */
static void drawStridedSlow(IWineD3DDevice *iface, const struct wined3d_stream_info *si, UINT NumVertexes, static void drawStridedSlow(IWineD3DDevice *iface, const struct wined3d_context *context,
GLenum glPrimType, const void *idxData, UINT idxSize, UINT minIndex, UINT startIdx) const struct wined3d_stream_info *si, UINT NumVertexes, GLenum glPrimType,
const void *idxData, UINT idxSize, UINT minIndex, UINT startIdx)
{ {
struct wined3d_context *context = context_get_current();
unsigned int textureNo = 0; unsigned int textureNo = 0;
const WORD *pIdxBufS = NULL; const WORD *pIdxBufS = NULL;
const DWORD *pIdxBufL = NULL; const DWORD *pIdxBufL = NULL;
@ -656,7 +656,8 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT numberOfVertice
} }
drawStridedSlowVs(iface, stream_info, index_count, glPrimType, idxData, idxSize, minIndex, StartIdx); drawStridedSlowVs(iface, stream_info, index_count, glPrimType, idxData, idxSize, minIndex, StartIdx);
} else { } else {
drawStridedSlow(iface, stream_info, index_count, glPrimType, idxData, idxSize, minIndex, StartIdx); drawStridedSlow(iface, context, stream_info, index_count,
glPrimType, idxData, idxSize, minIndex, StartIdx);
} }
} else if(This->instancedDraw) { } else if(This->instancedDraw) {
/* Instancing emulation with mixing immediate mode and arrays */ /* Instancing emulation with mixing immediate mode and arrays */