projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
st/mesa: fix comments, whitespace
[mesa.git]
/
src
/
mesa
/
state_tracker
/
st_cb_condrender.c
diff --git
a/src/mesa/state_tracker/st_cb_condrender.c
b/src/mesa/state_tracker/st_cb_condrender.c
index 780b40c206502da5303e3dd6f56a834f87b7edbd..64c6c117fca4efa71bff4a7720b2bda4f111c848 100644
(file)
--- a/
src/mesa/state_tracker/st_cb_condrender.c
+++ b/
src/mesa/state_tracker/st_cb_condrender.c
@@
-47,11
+47,12
@@
* Called via ctx->Driver.BeginConditionalRender()
*/
static void
* Called via ctx->Driver.BeginConditionalRender()
*/
static void
-st_BeginConditionalRender(
GL
context *ctx, struct gl_query_object *q,
+st_BeginConditionalRender(
struct gl_
context *ctx, struct gl_query_object *q,
GLenum mode)
{
struct st_query_object *stq = st_query_object(q);
GLenum mode)
{
struct st_query_object *stq = st_query_object(q);
- struct pipe_context *pipe = ctx->st->pipe;
+ struct st_context *st = st_context(ctx);
+ struct pipe_context *pipe = st->pipe;
uint m;
switch (mode) {
uint m;
switch (mode) {
@@
-69,8
+70,12
@@
st_BeginConditionalRender(GLcontext *ctx, struct gl_query_object *q,
break;
default:
assert(0 && "bad mode in st_BeginConditionalRender");
break;
default:
assert(0 && "bad mode in st_BeginConditionalRender");
+ m = PIPE_RENDER_COND_WAIT;
}
}
+ st->render_condition = stq->pq;
+ st->condition_mode = m;
+
pipe->render_condition(pipe, stq->pq, m);
}
pipe->render_condition(pipe, stq->pq, m);
}
@@
-79,11
+84,14
@@
st_BeginConditionalRender(GLcontext *ctx, struct gl_query_object *q,
* Called via ctx->Driver.BeginConditionalRender()
*/
static void
* Called via ctx->Driver.BeginConditionalRender()
*/
static void
-st_EndConditionalRender(
GL
context *ctx, struct gl_query_object *q)
+st_EndConditionalRender(
struct gl_
context *ctx, struct gl_query_object *q)
{
{
- struct pipe_context *pipe = ctx->st->pipe;
+ struct st_context *st = st_context(ctx);
+ struct pipe_context *pipe = st->pipe;
(void) q;
(void) q;
+
pipe->render_condition(pipe, NULL, 0);
pipe->render_condition(pipe, NULL, 0);
+ st->render_condition = NULL;
}
}