intel: Change signature of HiZ resolve functions

Now that intel_renderbuffer::region has been replaced with a miptree, the
HiZ functions region parameter must be replaced with a miptree parameter.

Change the return type from bool to void.

Rename the 'depth' parameter to 'layer', because it will correspond to
irb->mt_layer.

Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>

diff --git a/src/mesa/drivers/dri/i965/brw_vtbl.c b/src/mesa/drivers/dri/i965/brw_vtbl.c
index 75e8b26..dd2e05a 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_vtbl.c
+++ b/src/mesa/drivers/dri/i965/brw_vtbl.c
@@ -236,8 +236,8 @@ void brwInitVtbl( struct brw_context *brw )
    brw->intel.vtbl.is_hiz_depth_format = brw_is_hiz_depth_format;
 
    if (brw->intel.has_hiz) {
-      brw->intel.vtbl.hiz_resolve_hizbuffer = gen6_hiz_resolve_hizbuffer;
-      brw->intel.vtbl.hiz_resolve_depthbuffer = gen6_hiz_resolve_depthbuffer;
+      brw->intel.vtbl.resolve_depth_slice = gen6_resolve_depth_slice;
+      brw->intel.vtbl.resolve_hiz_slice = gen6_resolve_hiz_slice;
    }
 
    if (brw->intel.gen >= 7) {

diff --git a/src/mesa/drivers/dri/i965/gen6_hiz.c b/src/mesa/drivers/dri/i965/gen6_hiz.c
index fc6344b..5bb56a7 100644 (file)
--- a/src/mesa/drivers/dri/i965/gen6_hiz.c
+++ b/src/mesa/drivers/dri/i965/gen6_hiz.c
@@ -23,18 +23,20 @@
 
 #include "gen6_hiz.h"
 
-#include <assert.h>
-
 void
-gen6_hiz_resolve_depthbuffer(struct intel_context *intel,
-                             struct intel_region *depth_region)
+gen6_resolve_hiz_slice(struct intel_context *intel,
+                       struct intel_mipmap_tree *mt,
+                       uint32_t level,
+                       uint32_t layer)
 {
-   assert("!stub");
+   /* FINISHME: stub */
 }
 
 void
-gen6_hiz_resolve_hizbuffer(struct intel_context *intel,
-                           struct intel_region *depth_region)
+gen6_resolve_depth_slice(struct intel_context *intel,
+                         struct intel_mipmap_tree *mt,
+                         uint32_t level,
+                         uint32_t layer)
 {
-   assert("!stub");
+   /* FINISHME: stub */
 }

diff --git a/src/mesa/drivers/dri/i965/gen6_hiz.h b/src/mesa/drivers/dri/i965/gen6_hiz.h
index 4611182..4929012 100644 (file)
--- a/src/mesa/drivers/dri/i965/gen6_hiz.h
+++ b/src/mesa/drivers/dri/i965/gen6_hiz.h
@@ -23,13 +23,19 @@
 
 #pragma once
 
+#include <stdint.h>
+
 struct intel_context;
-struct intel_region;
+struct intel_mipmap_tree;
 
 void
-gen6_hiz_resolve_depthbuffer(struct intel_context *intel,
-                             struct intel_region *depth_region);
+gen6_resolve_hiz_slice(struct intel_context *intel,
+                       struct intel_mipmap_tree *mt,
+                       uint32_t level,
+                       uint32_t layer);
 
 void
-gen6_hiz_resolve_hizbuffer(struct intel_context *intel,
-                           struct intel_region *depth_region);
+gen6_resolve_depth_slice(struct intel_context *intel,
+                         struct intel_mipmap_tree *mt,
+                         uint32_t level,
+                         uint32_t layer);

diff --git a/src/mesa/drivers/dri/intel/intel_context.h b/src/mesa/drivers/dri/intel/intel_context.h
index f2be597..efaf721 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_context.h
+++ b/src/mesa/drivers/dri/intel/intel_context.h
@@ -166,10 +166,15 @@ struct intel_context
        *   - 7.5.3.3 Hierarchical Depth Buffer Resolve
        * \{
        */
-      void (*hiz_resolve_depthbuffer)(struct intel_context *intel,
-                                     struct intel_region *depth_region);
-      void (*hiz_resolve_hizbuffer)(struct intel_context *intel,
-                                   struct intel_region *depth_region);
+      void (*resolve_hiz_slice)(struct intel_context *intel,
+                               struct intel_mipmap_tree *mt,
+                               uint32_t level,
+                               uint32_t layer);
+
+      void (*resolve_depth_slice)(struct intel_context *intel,
+                                 struct intel_mipmap_tree *mt,
+                                 uint32_t level,
+                                 uint32_t layer);
       /** \} */
 
       /**