dri/nv25: Bind a hierarchical depth buffer.

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_bo_state.h b/src/mesa/drivers/dri/nouveau/nouveau_bo_state.h
index 6119a8336e3d866219f31d764a5584716a278993..388a16a56ea5d4777b2b4d077cf2b2e4097d8cc2 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_bo_state.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_bo_state.h
@@ -29,7 +29,7 @@
 
 enum {
        NOUVEAU_BO_CONTEXT_FRAMEBUFFER = 0,
-       NOUVEAU_BO_CONTEXT_LMA_DEPTH,
+       NOUVEAU_BO_CONTEXT_HIERZ,
        NOUVEAU_BO_CONTEXT_SURFACE,
        NOUVEAU_BO_CONTEXT_TEXTURE0,
        NOUVEAU_BO_CONTEXT_TEXTURE1,

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_class.h b/src/mesa/drivers/dri/nouveau/nouveau_class.h
index d41d431f796f1b48cc563ce35b0b285f07bc2771..687b847797bc2ee57e38af4a53293ae9292ec64f 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_class.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_class.h
@@ -4954,6 +4954,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define  NV25TCL_DMA_IN_MEMORY5                                                                0x000001a0
 #define  NV25TCL_DMA_IN_MEMORY8                                                                0x000001ac
 #define  NV25TCL_DMA_IN_MEMORY9                                                                0x000001b0
+#define  NV25TCL_HIERZ_PITCH                                                           0x0000022c
+#define  NV25TCL_HIERZ_OFFSET                                                          0x00000230
 
 #endif /* NOUVEAU_REG_H */
 

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state_fb.c b/src/mesa/drivers/dri/nouveau/nv10_state_fb.c
index d87fe96b1c02cf4d754085df273cfea73b5b2d2e..0fda9faf49bd253ceac7cbddbd5321ffd2b4680b 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv10_state_fb.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state_fb.c
@@ -51,11 +51,11 @@ get_rt_format(gl_format format)
 }
 
 static void
-setup_lma_buffer(struct gl_context *ctx)
+setup_hierz_buffer(struct gl_context *ctx)
 {
        struct nouveau_channel *chan = context_chan(ctx);
        struct nouveau_grobj *celsius = context_eng3d(ctx);
-       struct nouveau_bo_context *bctx = context_bctx(ctx, LMA_DEPTH);
+       struct nouveau_bo_context *bctx = context_bctx(ctx, HIERZ);
        struct gl_framebuffer *fb = ctx->DrawBuffer;
        struct nouveau_framebuffer *nfb = to_nouveau_framebuffer(fb);
        unsigned pitch = align(fb->Width, 128),
@@ -135,7 +135,7 @@ nv10_emit_framebuffer(struct gl_context *ctx, int emit)
                                 s->bo, 0, bo_flags);
 
                if (context_chipset(ctx) >= 0x17) {
-                       setup_lma_buffer(ctx);
+                       setup_hierz_buffer(ctx);
                        context_dirty(ctx, ZCLEAR);
                }
        }

diff --git a/src/mesa/drivers/dri/nouveau/nv20_context.c b/src/mesa/drivers/dri/nouveau/nv20_context.c
index 4ca7cd6c98423b545ca5d33ef1fc0e1f022ec734..c31fd39fac44f1904b38c2907dea849981611e35 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv20_context.c
+++ b/src/mesa/drivers/dri/nouveau/nv20_context.c
@@ -187,10 +187,6 @@ nv20_hwctx_init(struct gl_context *ctx)
        OUT_RING  (chan, 2);
 
        if (context_chipset(ctx) >= 0x25) {
-               BEGIN_RING(chan, kelvin, 0x022c, 2);
-               OUT_RING  (chan, 0x280);
-               OUT_RING  (chan, 0x07d28000);
-
                BEGIN_RING(chan, kelvin, 0x1da4, 1);
                OUT_RING  (chan, 0);
        }

diff --git a/src/mesa/drivers/dri/nouveau/nv20_state_fb.c b/src/mesa/drivers/dri/nouveau/nv20_state_fb.c
index 7822ca2a09881d5efc002f62b3d87a96844e312a..854392f9ff3c6203f923a571d966e55d067996ee 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv20_state_fb.c
+++ b/src/mesa/drivers/dri/nouveau/nv20_state_fb.c
@@ -51,6 +51,31 @@ get_rt_format(gl_format format)
        }
 }
 
+static void
+setup_hierz_buffer(struct gl_context *ctx)
+{
+       struct nouveau_channel *chan = context_chan(ctx);
+       struct nouveau_grobj *kelvin = context_eng3d(ctx);
+       struct nouveau_bo_context *bctx = context_bctx(ctx, HIERZ);
+       struct gl_framebuffer *fb = ctx->DrawBuffer;
+       struct nouveau_framebuffer *nfb = to_nouveau_framebuffer(fb);
+       unsigned pitch = align(fb->Width, 128),
+               height = align(fb->Height, 2),
+               size = pitch * height;
+
+       if (!nfb->hierz.bo || nfb->hierz.bo->size != size) {
+               nouveau_bo_ref(NULL, &nfb->hierz.bo);
+               nouveau_bo_new(context_dev(ctx), NOUVEAU_BO_VRAM, 0, size,
+                              &nfb->hierz.bo);
+       }
+
+       BEGIN_RING(chan, kelvin, NV25TCL_HIERZ_PITCH, 1);
+       OUT_RING(chan, pitch);
+
+       nouveau_bo_markl(bctx, kelvin, NV25TCL_HIERZ_OFFSET, nfb->hierz.bo,
+                        0, NOUVEAU_BO_VRAM | NOUVEAU_BO_RDWR);
+}
+
 void
 nv20_emit_framebuffer(struct gl_context *ctx, int emit)
 {
@@ -88,6 +113,9 @@ nv20_emit_framebuffer(struct gl_context *ctx, int emit)
 
                nouveau_bo_markl(bctx, kelvin, NV20TCL_ZETA_OFFSET,
                                 s->bo, 0, bo_flags);
+
+               if (context_chipset(ctx) >= 0x25)
+                       setup_hierz_buffer(ctx);
        } else {
                rt_format |= get_rt_format(MESA_FORMAT_Z24_S8);
                zeta_pitch = rt_pitch;