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

wined3d: Pass a wined3d_context_gl structure to context_unload_numbered_array(). 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2019-06-19 04:20:08 +04:30 committed by Alexandre Julliard
parent f585a301c7
commit 7dd4bb2ab6
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/wined3d/context.c
View File

@ -5303,26 +5303,27 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte
wined3d_context_gl_load_tex_coords(context_gl, si, &current_bo, state); wined3d_context_gl_load_tex_coords(context_gl, si, &current_bo, state);
} }
static void context_unload_numbered_array(struct wined3d_context *context, unsigned int i) static void wined3d_context_gl_unload_numbered_array(struct wined3d_context_gl *context_gl, unsigned int i)
{ {
const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_gl_info *gl_info = context_gl->c.gl_info;
GL_EXTCALL(glDisableVertexAttribArray(i)); GL_EXTCALL(glDisableVertexAttribArray(i));
checkGLcall("glDisableVertexAttribArray"); checkGLcall("glDisableVertexAttribArray");
if (gl_info->supported[ARB_INSTANCED_ARRAYS]) if (gl_info->supported[ARB_INSTANCED_ARRAYS])
GL_EXTCALL(glVertexAttribDivisor(i, 0)); GL_EXTCALL(glVertexAttribDivisor(i, 0));
context->numbered_array_mask &= ~(1u << i); context_gl->c.numbered_array_mask &= ~(1u << i);
} }
static void context_unload_numbered_arrays(struct wined3d_context *context) static void context_unload_numbered_arrays(struct wined3d_context *context)
{ {
struct wined3d_context_gl *context_gl = wined3d_context_gl(context);
unsigned int i; unsigned int i;
while (context->numbered_array_mask) while (context->numbered_array_mask)
{ {
i = wined3d_bit_scan(&context->numbered_array_mask); i = wined3d_bit_scan(&context->numbered_array_mask);
context_unload_numbered_array(context, i); wined3d_context_gl_unload_numbered_array(context_gl, i);
} }
} }
@ -5348,7 +5349,7 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c
if (!(stream_info->use_map & (1u << i))) if (!(stream_info->use_map & (1u << i)))
{ {
if (context->numbered_array_mask & (1u << i)) if (context->numbered_array_mask & (1u << i))
context_unload_numbered_array(context, i); wined3d_context_gl_unload_numbered_array(context_gl, i);
if (!use_vs(state) && i == WINED3D_FFP_DIFFUSE) if (!use_vs(state) && i == WINED3D_FFP_DIFFUSE)
{ {
if (!(context_gl->default_attrib_value_set & (1u << i)) || !context_gl->diffuse_attrib_to_1) if (!(context_gl->default_attrib_value_set & (1u << i)) || !context_gl->diffuse_attrib_to_1)
@ -5385,7 +5386,7 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c
/* Unload instanced arrays, they will be loaded using immediate /* Unload instanced arrays, they will be loaded using immediate
* mode instead. */ * mode instead. */
if (context->numbered_array_mask & (1u << i)) if (context->numbered_array_mask & (1u << i))
context_unload_numbered_array(context, i); wined3d_context_gl_unload_numbered_array(context_gl, i);
context_gl->default_attrib_value_set &= ~(1u << i); context_gl->default_attrib_value_set &= ~(1u << i);
continue; continue;
} }
@ -5435,7 +5436,7 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c
ptr += (ULONG_PTR)wined3d_buffer_load_sysmem(stream->buffer, context); ptr += (ULONG_PTR)wined3d_buffer_load_sysmem(stream->buffer, context);
if (context->numbered_array_mask & (1u << i)) if (context->numbered_array_mask & (1u << i))
context_unload_numbered_array(context, i); wined3d_context_gl_unload_numbered_array(context_gl, i);
switch (format_gl->f.id) switch (format_gl->f.id)
{ {