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

wined3d: Pass a wined3d_state structure to remove_vbos().

This commit is contained in:
Henri Verbeet 2010-10-01 12:25:47 +02:00 committed by Alexandre Julliard
parent cf9d9e3204
commit 4dcd56f43b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/wined3d/drawprim.c
View File

@ -537,8 +537,8 @@ static void drawStridedInstanced(const struct wined3d_gl_info *gl_info, const st
} }
} }
static inline void remove_vbos(IWineD3DDeviceImpl *This, const struct wined3d_gl_info *gl_info, static void remove_vbos(const struct wined3d_gl_info *gl_info,
struct wined3d_stream_info *s) const struct wined3d_state *state, struct wined3d_stream_info *s)
{ {
unsigned int i; unsigned int i;
@ -551,7 +551,7 @@ static inline void remove_vbos(IWineD3DDeviceImpl *This, const struct wined3d_gl
e = &s->elements[i]; e = &s->elements[i];
if (e->buffer_object) if (e->buffer_object)
{ {
struct wined3d_buffer *vb = This->stateBlock->state.streams[e->stream_idx].buffer; struct wined3d_buffer *vb = state->streams[e->stream_idx].buffer;
e->buffer_object = 0; e->buffer_object = 0;
e->data = (BYTE *)((ULONG_PTR)e->data + (ULONG_PTR)buffer_get_sysmem(vb, gl_info)); e->data = (BYTE *)((ULONG_PTR)e->data + (ULONG_PTR)buffer_get_sysmem(vb, gl_info));
} }
@ -683,7 +683,7 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT StartIdx, UINT
if(emulation) { if(emulation) {
stream_info = &stridedlcl; stream_info = &stridedlcl;
memcpy(&stridedlcl, &This->strided_streams, sizeof(stridedlcl)); memcpy(&stridedlcl, &This->strided_streams, sizeof(stridedlcl));
remove_vbos(This, context->gl_info, &stridedlcl); remove_vbos(context->gl_info, state, &stridedlcl);
} }
} }