Mesa (master): i965/blorp: Add fields brw_blorp_mip_info::level, layer

[Chad Versace]

Module: Mesa
Branch: master
Commit: 87f4541bc1007dda1e345c16db94672620bc8fb2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=87f4541bc1007dda1e345c16db94672620bc8fb2

Author: Chad Versace <chad.versace at linux.intel.com>
Date:   Tue Mar 19 17:44:50 2013 -0700

i965/blorp: Add fields brw_blorp_mip_info::level,layer

The new fields define the 2D miptree slice to be used. A following patch
will pass the new fields through to intel_miptree_slice_has_hiz().

Reviewed-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Signed-off-by: Chad Versace <chad.versace at linux.intel.com>

---

 src/mesa/drivers/dri/i965/brw_blorp.cpp |    4 ++++
 src/mesa/drivers/dri/i965/brw_blorp.h   |   11 +++++++++++
 2 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_blorp.cpp b/src/mesa/drivers/dri/i965/brw_blorp.cpp
index ed966c6..9c6fe49 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp.cpp
+++ b/src/mesa/drivers/dri/i965/brw_blorp.cpp
@@ -30,6 +30,8 @@
 
 brw_blorp_mip_info::brw_blorp_mip_info()
    : mt(NULL),
+     level(0),
+     layer(0),
      width(0),
      height(0),
      x_offset(0),
@@ -50,6 +52,8 @@ brw_blorp_mip_info::set(struct intel_mipmap_tree *mt,
    intel_miptree_check_level_layer(mt, level, layer);
 
    this->mt = mt;
+   this->level = level;
+   this->layer = layer;
    this->width = mt->level[level].width;
    this->height = mt->level[level].height;
 
diff --git a/src/mesa/drivers/dri/i965/brw_blorp.h b/src/mesa/drivers/dri/i965/brw_blorp.h
index 79a3f3a..1b95818 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp.h
+++ b/src/mesa/drivers/dri/i965/brw_blorp.h
@@ -69,6 +69,17 @@ public:
    struct intel_mipmap_tree *mt;
 
    /**
+    * The miplevel to use.
+    */
+   uint32_t level;
+
+   /**
+    * The 2D layer within the miplevel. Combined, level and layer define the
+    * 2D miptree slice to use.
+    */
+   uint32_t layer;
+
+   /**
     * Width of the miplevel to be used.  For surfaces using
     * INTEL_MSAA_LAYOUT_IMS, this is measured in samples, not pixels.
     */