diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-10-14 18:05:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-10-14 18:05:14 +1000 |
| commit | ce5cba040c34a1a70186c29a5055e9be3c85a54a (patch) | |
| tree | dd292fa00e3f59abe3d9acf76e9866c0c93e9acf /src | |
| parent | 51d1cf55da6f8b8a215814589a189b6e5e537fe5 (diff) | |
r300g: add one more ZTOP disable bit.
Still missing the frag uses kill support, hopefully nha can point that out.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/r300/r300_fs.h | 6 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/r300_state.c | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/gallium/drivers/r300/r300_fs.h b/src/gallium/drivers/r300/r300_fs.h index 967e9f697e..04453274aa 100644 --- a/src/gallium/drivers/r300/r300_fs.h +++ b/src/gallium/drivers/r300/r300_fs.h @@ -48,4 +48,10 @@ struct r300_fragment_shader { void r300_translate_fragment_shader(struct r300_context* r300, struct r300_fragment_shader* fs); +static inline boolean r300_fragment_shader_writes_depth(struct r300_fragment_shader *fs) +{ + if (!fs) + return FALSE; + return (fs->code.writes_depth) ? TRUE : FALSE; +} #endif /* R300_FS_H */ diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c index d8533ac168..95e2943baa 100644 --- a/src/gallium/drivers/r300/r300_state.c +++ b/src/gallium/drivers/r300/r300_state.c @@ -252,9 +252,11 @@ static void* 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 (!is_empty_list(&r300->query_list)) + if (r300->query_current) dsa->z_buffer_top = R300_ZTOP_DISABLE; return (void*)dsa; |