Commit 5f69c156 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

wined3d: Pass a wined3d_context_gl structure to wined3d_query_buffer_queue_result().

parent ca35a556
...@@ -73,16 +73,16 @@ static void wined3d_query_destroy_buffer_object(struct wined3d_context_gl *conte ...@@ -73,16 +73,16 @@ static void wined3d_query_destroy_buffer_object(struct wined3d_context_gl *conte
* object allows us to avoid these implicit flushes. An additional benefit is * object allows us to avoid these implicit flushes. An additional benefit is
* that it allows us to poll the query status from the application-thread * that it allows us to poll the query status from the application-thread
* instead of from the csmt-thread. */ * instead of from the csmt-thread. */
static BOOL wined3d_query_buffer_queue_result(struct wined3d_context *context, struct wined3d_query *query, GLuint id) static BOOL wined3d_query_buffer_queue_result(struct wined3d_context_gl *context_gl,
struct wined3d_query *query, GLuint id)
{ {
struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context_gl->c.gl_info;
const struct wined3d_gl_info *gl_info = context->gl_info;
GLsync tmp_sync; GLsync tmp_sync;
if (!gl_info->supported[ARB_QUERY_BUFFER_OBJECT] || !gl_info->supported[ARB_BUFFER_STORAGE]) if (!gl_info->supported[ARB_QUERY_BUFFER_OBJECT] || !gl_info->supported[ARB_BUFFER_STORAGE])
return FALSE; return FALSE;
/* Don't use query buffers without CSMT, mainly for simplicity. */ /* Don't use query buffers without CSMT, mainly for simplicity. */
if (!context->device->cs->thread) if (!context_gl->c.device->cs->thread)
return FALSE; return FALSE;
if (query->buffer_object) if (query->buffer_object)
...@@ -684,7 +684,7 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD ...@@ -684,7 +684,7 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD
gl_info = context_gl->c.gl_info; gl_info = context_gl->c.gl_info;
GL_EXTCALL(glEndQuery(GL_SAMPLES_PASSED)); GL_EXTCALL(glEndQuery(GL_SAMPLES_PASSED));
checkGLcall("glEndQuery()"); checkGLcall("glEndQuery()");
wined3d_query_buffer_queue_result(&context_gl->c, query, oq->id); wined3d_query_buffer_queue_result(context_gl, query, oq->id);
context_release(&context_gl->c); context_release(&context_gl->c);
poll = TRUE; poll = TRUE;
......
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