Commit de16768d authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

wined3d: Move the "blit_vbo" field from struct wined3d_context to struct wined3d_context_gl.

parent 3171193b
......@@ -1444,9 +1444,6 @@ void wined3d_context_cleanup(struct wined3d_context *context)
}
}
if (context->blit_vbo)
GL_EXTCALL(glDeleteBuffers(1, &context->blit_vbo));
checkGLcall("context cleanup");
}
......@@ -1494,6 +1491,9 @@ void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl)
if (context_gl->dummy_arbfp_prog)
GL_EXTCALL(glDeleteProgramsARB(1, &context_gl->dummy_arbfp_prog));
if (context_gl->blit_vbo)
GL_EXTCALL(glDeleteBuffers(1, &context_gl->blit_vbo));
checkGLcall("context cleanup");
}
......@@ -5630,9 +5630,9 @@ void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_te
/* Draw a quad. */
if (gl_info->supported[ARB_VERTEX_BUFFER_OBJECT])
{
if (!context->blit_vbo)
GL_EXTCALL(glGenBuffers(1, &context->blit_vbo));
GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, context->blit_vbo));
if (!context_gl->blit_vbo)
GL_EXTCALL(glGenBuffers(1, &context_gl->blit_vbo));
GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, context_gl->blit_vbo));
context_unload_vertex_data(context);
context_unload_numbered_arrays(context);
......
......@@ -2013,8 +2013,6 @@ struct wined3d_context
struct wined3d_fence *buffer_fences[MAX_ATTRIBS];
unsigned int buffer_fence_count;
GLuint blit_vbo;
unsigned int viewport_count;
unsigned int scissor_rect_count;
};
......@@ -2033,6 +2031,8 @@ struct wined3d_context_gl
GLenum *texture_type;
GLuint blit_vbo;
unsigned int tex_unit_map[WINED3D_MAX_COMBINED_SAMPLERS];
unsigned int rev_tex_unit_map[MAX_GL_FRAGMENT_SAMPLERS + WINED3D_MAX_VERTEX_SAMPLERS];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment