Henri Verbeet : wined3d: Explicitly pass the context to drawStridedSlow().
Alexandre Julliard
julliard at winehq.org
Fri Aug 7 08:49:22 CDT 2009
Module: wine
Branch: master
Commit: 0479fb13b51c2113cc2ca782258aad9fc1f51604
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0479fb13b51c2113cc2ca782258aad9fc1f51604
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Fri Aug 7 08:51:19 2009 +0200
wined3d: Explicitly pass the context to drawStridedSlow().
---
dlls/wined3d/drawprim.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c
index 09cb960..9a5aef7 100644
--- a/dlls/wined3d/drawprim.c
+++ b/dlls/wined3d/drawprim.c
@@ -70,10 +70,10 @@ static void drawStridedFast(IWineD3DDevice *iface, GLenum primitive_type,
*/
/* GL locking is done by the caller */
-static void drawStridedSlow(IWineD3DDevice *iface, const struct wined3d_stream_info *si, UINT NumVertexes,
- GLenum glPrimType, const void *idxData, UINT idxSize, UINT minIndex, UINT startIdx)
+static void drawStridedSlow(IWineD3DDevice *iface, const struct wined3d_context *context,
+ 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;
const WORD *pIdxBufS = 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);
} 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) {
/* Instancing emulation with mixing immediate mode and arrays */
More information about the wine-cvs
mailing list