Mesa (master): r300g: add one more ZTOP disable bit.
Dave Airlie
airlied at kemper.freedesktop.org
Wed Oct 14 08:06:20 UTC 2009
Module: Mesa
Branch: master
Commit: ce5cba040c34a1a70186c29a5055e9be3c85a54a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ce5cba040c34a1a70186c29a5055e9be3c85a54a
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Oct 14 18:05:14 2009 +1000
r300g: add one more ZTOP disable bit.
Still missing the frag uses kill support, hopefully nha can point that out.
---
src/gallium/drivers/r300/r300_fs.h | 6 ++++++
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 967e9f6..0445327 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 d8533ac..95e2943 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;
More information about the mesa-commit
mailing list