KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

r300g: Move ztop to derived state. 

Need to get it into its own atom instead of piggybacking on DSA.
This commit is contained in:
Corbin Simpson 2009-10-14 03:09:41 -07:00
parent f13e507798
commit fd63f89e95
2 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gallium/drivers/r300/r300_state.c
View File

@ -190,7 +190,6 @@ static void*
r300_create_dsa_state(struct pipe_context* pipe,
const struct pipe_depth_stencil_alpha_state* state)
{
struct r300_context* r300 = r300_context(pipe);
struct r300_dsa_state* dsa = CALLOC_STRUCT(r300_dsa_state);
/* Depth test setup. */
@ -250,15 +249,6 @@ static void*
0, 1023);
}
dsa->z_buffer_top = R300_ZTOP_ENABLE;
/* XXX TODO: add frag prog rules for ztop disable */
if (r300_fragment_shader_writes_depth(r300->fs))
dsa->z_buffer_top = R300_ZTOP_DISABLE;
if (state->alpha.enabled && state->alpha.func != PIPE_FUNC_ALWAYS)
dsa->z_buffer_top = R300_ZTOP_DISABLE;
if (r300->query_current)
dsa->z_buffer_top = R300_ZTOP_DISABLE;
return (void*)dsa;
}

36
src/gallium/drivers/r300/r300_state_derived.c
View File

@ -444,6 +444,37 @@ static void r300_update_rs_block(struct r300_context* r300)
rs->inst_count = MAX2(MAX2(col_count - 1, tex_count - 1), 0);
}
static void r300_update_ztop(struct r300_context* r300)
{
r300->dsa_state->z_buffer_top = R300_ZTOP_ENABLE;
/* This is important enough that I felt it warranted a comment.
*
* According to the docs, these are the conditions where ZTOP must be
* disabled:
* 1) Alpha testing enabled
* 2) Texture kill instructions in fragment shader
* 3) Chroma key culling enabled
* 4) W-buffering enabled
*
* The docs claim that for the first three cases, if no ZS writes happen,
* then ZTOP can be used.
*
* Additionally, the following conditions require disabled ZTOP:
* ~) Depth writes in fragment shader
* ~) Outstanding occlusion queries
*
* ~C.
*/
if (r300->dsa_state->alpha_function) {
r300->dsa_state->z_buffer_top = R300_ZTOP_DISABLE;
} else if (r300_fragment_shader_writes_depth(r300->fs)) {
r300->dsa_state->z_buffer_top = R300_ZTOP_DISABLE;
} else if (r300->query_current) {
r300->dsa_state->z_buffer_top = R300_ZTOP_DISABLE;
}
}
void r300_update_derived_state(struct r300_context* r300)
{
if (r300->dirty_state &
@ -455,4 +486,9 @@ void r300_update_derived_state(struct r300_context* r300)
r300_update_fs_tab(r300);
r300_update_rs_block(r300);
}
if (r300->dirty_state &
(R300_NEW_DSA | R300_NEW_FRAGMENT_SHADER | R300_NEW_QUERY)) {
r300_update_ztop(r300);
}
}