fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 06:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st/mesa: GenerateMipmap should not be killed by conditional rendering

Browse source 
NOTE: This is a candidate for the 7.10 branch.

Reviewed-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit 1c95c3ef9c)

Conflicts:

	src/mesa/state_tracker/st_context.h
This commit is contained in:
Marek Olšák 2011-06-01 01:41:54 +02:00
parent 23d9baa5a1
commit 06b04a2a64
3 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/mesa/state_tracker/st_cb_condrender.c
View file

@ -51,7 +51,8 @@ st_BeginConditionalRender(struct gl_context *ctx, struct gl_query_object *q,
GLenum mode)
{
struct st_query_object *stq = st_query_object(q);
struct pipe_context *pipe = st_context(ctx)->pipe;
struct st_context *st = st_context(ctx);
struct pipe_context *pipe = st->pipe;
uint m;
switch (mode) {
@ -72,6 +73,9 @@ st_BeginConditionalRender(struct gl_context *ctx, struct gl_query_object *q,
m = PIPE_RENDER_COND_WAIT;
}
st->render_condition = stq->pq;
st->condition_mode = m;
pipe->render_condition(pipe, stq->pq, m);
}
@ -82,9 +86,12 @@ st_BeginConditionalRender(struct gl_context *ctx, struct gl_query_object *q,
static void
st_EndConditionalRender(struct gl_context *ctx, struct gl_query_object *q)
{
struct pipe_context *pipe = st_context(ctx)->pipe;
struct st_context *st = st_context(ctx);
struct pipe_context *pipe = st->pipe;
(void) q;
pipe->render_condition(pipe, NULL, 0);
st->render_condition = NULL;
}

4
src/mesa/state_tracker/st_context.h
View file

@ -190,6 +190,10 @@ struct st_context
int force_msaa;
void *winsys_drawable_handle;
/* Active render condition. */
struct pipe_query *render_condition;
unsigned condition_mode;
};

9
src/mesa/state_tracker/st_gen_mipmap.c
View file

@ -91,9 +91,18 @@ st_render_mipmap(struct st_context *st,
return FALSE;
}
/* Disable conditional rendering. */
if (st->render_condition) {
pipe->render_condition(pipe, NULL, 0);
}
util_gen_mipmap(st->gen_mipmap, psv, face, baseLevel, lastLevel,
PIPE_TEX_FILTER_LINEAR);
if (st->render_condition) {
pipe->render_condition(pipe, st->render_condition, st->condition_mode);
}
return TRUE;
}