aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/state_tracker
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-06-21 10:37:30 +0200
committermarha <marha@users.sourceforge.net>2013-06-21 10:37:30 +0200
commit84f6a75a56f4749f91a51a161c1989cbc8807b80 (patch)
treee72d3e4ee697bb7f35a2dccb6f17edf3a03a6d78 /mesalib/src/mesa/state_tracker
parent6ac57d622cdabb2db9f8dce51f0313892e6bd1aa (diff)
parent7f9fb534564d0eb8a62cf444e569a07166e5ee03 (diff)
downloadvcxsrv-84f6a75a56f4749f91a51a161c1989cbc8807b80.tar.gz
vcxsrv-84f6a75a56f4749f91a51a161c1989cbc8807b80.tar.bz2
vcxsrv-84f6a75a56f4749f91a51a161c1989cbc8807b80.zip
Merge remote-tracking branch 'origin/released'
* origin/released: xserver mesa git update 21 June 2013 Conflicts: xorg-server/hw/xwin/windialogs.c xorg-server/hw/xwin/winmultiwindowclass.c
Diffstat (limited to 'mesalib/src/mesa/state_tracker')
-rw-r--r--mesalib/src/mesa/state_tracker/st_cb_condrender.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_condrender.c b/mesalib/src/mesa/state_tracker/st_cb_condrender.c
index 3a5835ecd..8776985f9 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_condrender.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_condrender.c
@@ -76,12 +76,12 @@ st_BeginConditionalRender(struct gl_context *ctx, struct gl_query_object *q,
m = PIPE_RENDER_COND_WAIT;
}
- cso_set_render_condition(st->cso_context, stq->pq, m);
+ cso_set_render_condition(st->cso_context, stq->pq, FALSE, m);
}
/**
- * Called via ctx->Driver.BeginConditionalRender()
+ * Called via ctx->Driver.EndConditionalRender()
*/
static void
st_EndConditionalRender(struct gl_context *ctx, struct gl_query_object *q)
@@ -91,7 +91,7 @@ st_EndConditionalRender(struct gl_context *ctx, struct gl_query_object *q)
st_flush_bitmap_cache(st);
- cso_set_render_condition(st->cso_context, NULL, 0);
+ cso_set_render_condition(st->cso_context, NULL, FALSE, 0);
}