r300g: move ZTOP to separate file

Ideally, HiZ should go in r300_hyperz.c next to ZTOP.

1 files changed, 2 insertions, 72 deletions

diff --git a/src/gallium/drivers/r300/r300_state_derived.c b/src/gallium/drivers/r300/r300_state_derived.c
index 46c192eae1..10ea579be3 100644
--- a/src/gallium/drivers/r300/r300_state_derived.c
+++ b/src/gallium/drivers/r300/r300_state_derived.c
@@ -28,6 +28,7 @@
 
 #include "r300_context.h"
 #include "r300_fs.h"
+#include "r300_hyperz.h"
 #include "r300_screen.h"
 #include "r300_shader_semantics.h"
 #include "r300_state.h"
@@ -402,77 +403,6 @@ static void r300_update_derived_shader_state(struct r300_context* r300)
     r300_update_rs_block(r300, &vs->outputs, &r300_fs(r300)->shader->inputs);
 }
 
-static boolean r300_dsa_writes_depth_stencil(struct r300_dsa_state* dsa)
-{
-    /* We are interested only in the cases when a new depth or stencil value
-     * can be written and changed. */
-
-    /* We might optionally check for [Z func: never] and inspect the stencil
-     * state in a similar fashion, but it's not terribly important. */
-    return (dsa->z_buffer_control & R300_Z_WRITE_ENABLE) ||
-           (dsa->stencil_ref_mask & R300_STENCILWRITEMASK_MASK) ||
-           ((dsa->z_buffer_control & R500_STENCIL_REFMASK_FRONT_BACK) &&
-            (dsa->stencil_ref_bf & R300_STENCILWRITEMASK_MASK));
-}
-
-static boolean r300_dsa_alpha_test_enabled(struct r300_dsa_state* dsa)
-{
-    /* We are interested only in the cases when alpha testing can kill
-     * a fragment. */
-    uint32_t af = dsa->alpha_function;
-
-    return (af & R300_FG_ALPHA_FUNC_ENABLE) &&
-           (af & R300_FG_ALPHA_FUNC_ALWAYS) != R300_FG_ALPHA_FUNC_ALWAYS;
-}
-
-static void r300_update_ztop(struct r300_context* r300)
-{
-    struct r300_ztop_state* ztop_state =
-        (struct r300_ztop_state*)r300->ztop_state.state;
-
-    /* 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.
-     *
-     * (3) will never apply since we do not support chroma-keyed operations.
-     * (4) will need to be re-examined (and this comment updated) if/when
-     * Hyper-Z becomes supported.
-     *
-     * Additionally, the following conditions require disabled ZTOP:
-     * 5) Depth writes in fragment shader
-     * 6) Outstanding occlusion queries
-     *
-     * This register causes stalls all the way from SC to CB when changed,
-     * but it is buffered on-chip so it does not hurt to write it if it has
-     * not changed.
-     *
-     * ~C.
-     */
-
-    /* ZS writes */
-    if (r300_dsa_writes_depth_stencil(r300->dsa_state.state) &&
-           (r300_dsa_alpha_test_enabled(r300->dsa_state.state) ||  /* (1) */
-            r300_fs(r300)->shader->info.uses_kill)) {              /* (2) */
-        ztop_state->z_buffer_top = R300_ZTOP_DISABLE;
-    } else if (r300_fragment_shader_writes_depth(r300_fs(r300))) { /* (5) */
-        ztop_state->z_buffer_top = R300_ZTOP_DISABLE;
-    } else if (r300->query_current) {                              /* (6) */
-        ztop_state->z_buffer_top = R300_ZTOP_DISABLE;
-    } else {
-        ztop_state->z_buffer_top = R300_ZTOP_ENABLE;
-    }
-
-    r300->ztop_state.dirty = TRUE;
-}
-
 static void r300_merge_textures_and_samplers(struct r300_context* r300)
 {
     struct r300_textures_state *state =
@@ -578,5 +508,5 @@ void r300_update_derived_state(struct r300_context* r300)
         r300_swtcl_vertex_psc(r300);
     }
 
-    r300_update_ztop(r300);
+    r300_update_hyperz_state(r300);
 }