From f17b12278dcc0e370d04a2a9a73677ab4c9f2c26 Mon Sep 17 00:00:00 2001 From: Chad Versace Date: Wed, 16 Nov 2011 23:23:30 -0800 Subject: [PATCH] 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 Signed-off-by: Chad Versace --- src/mesa/drivers/dri/i965/brw_vtbl.c | 4 ++-- src/mesa/drivers/dri/i965/gen6_hiz.c | 18 ++++++++++-------- src/mesa/drivers/dri/i965/gen6_hiz.h | 16 +++++++++++----- src/mesa/drivers/dri/intel/intel_context.h | 13 +++++++++---- 4 files changed, 32 insertions(+), 19 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_vtbl.c b/src/mesa/drivers/dri/i965/brw_vtbl.c index 75e8b2645b6..dd2e05a3669 100644 --- 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 fc6344b0aa9..5bb56a78348 100644 --- 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 - 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 4611182b980..49290123ff0 100644 --- 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 + 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 f2be5973851..efaf721ae82 100644 --- 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); /** \} */ /** -- 2.30.2