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

gallium: remove depth.occlusion_count flag

Browse source 
This was redundant as drivers can just keep track of whether they are
inside a begin/end query pair.  We want to add more query types later
and also support nested queries, none of which map well onto a flag like
this.  No driver appeared to be using the flag.
This commit is contained in:
Keith Whitwell 2009-10-01 14:34:23 +01:00
parent ae2daacbac
commit 4456006ba6
6 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/drivers/llvmpipe/lp_bld_depth.c
View file

@ -210,7 +210,4 @@ lp_build_depth_test(LLVMBuilderRef builder,
dst = lp_build_select(&bld, z_bitmask, src, dst);
LLVMBuildStore(builder, dst, dst_ptr);
}
/* FIXME */
assert(!state->occlusion_count);
}

1
src/gallium/drivers/llvmpipe/lp_state_fs.c
View file

@ -401,7 +401,6 @@ generate_fragment(struct llvmpipe_context *lp,
if(key->depth.enabled) {
debug_printf("depth.func = %s\n", debug_dump_func(key->depth.func, TRUE));
debug_printf("depth.writemask = %u\n", key->depth.writemask);
debug_printf("depth.occlusion_count = %u\n", key->depth.occlusion_count);
}
if(key->alpha.enabled) {
debug_printf("alpha.func = %s\n", debug_dump_func(key->alpha.func, TRUE));

1
src/gallium/drivers/softpipe/sp_video_context.c
View file

@ -167,7 +167,6 @@ init_pipe_state(struct sp_mpeg12_context *ctx)
dsa.depth.enabled = 0;
dsa.depth.writemask = 0;
dsa.depth.func = PIPE_FUNC_ALWAYS;
dsa.depth.occlusion_count = 0;
for (i = 0; i < 2; ++i) {
dsa.stencil[i].enabled = 0;
dsa.stencil[i].func = PIPE_FUNC_ALWAYS;

1
src/gallium/include/pipe/p_state.h
View file

@ -197,7 +197,6 @@ struct pipe_depth_state
unsigned enabled:1; /**< depth test enabled? */
unsigned writemask:1; /**< allow depth buffer writes? */
unsigned func:3; /**< depth test func (PIPE_FUNC_x) */
unsigned occlusion_count:1; /**< do occlusion counting? */
};

1
src/gallium/state_trackers/g3dvl/vl_context.c
View file

@ -69,7 +69,6 @@ static int vlInitCommon(struct vlContext *context)
dsa.depth.enabled = 0;
dsa.depth.writemask = 0;
dsa.depth.func = PIPE_FUNC_ALWAYS;
dsa.depth.occlusion_count = 0;
for (i = 0; i < 2; ++i)
{
dsa.stencil[i].enabled = 0;

4
src/mesa/state_tracker/st_atom_depth.c
View file

@ -104,10 +104,6 @@ update_depth_stencil_alpha(struct st_context *st)
dsa->depth.func = st_compare_func_to_pipe(ctx->Depth.Func);
}
if (ctx->Query.CurrentOcclusionObject &&
ctx->Query.CurrentOcclusionObject->Active)
dsa->depth.occlusion_count = 1;
if (ctx->Stencil.Enabled && ctx->DrawBuffer->Visual.stencilBits > 0) {
dsa->stencil[0].enabled = 1;
dsa->stencil[0].func = st_compare_func_to_pipe(ctx->Stencil.Function[0]);