[Mesa-dev] [PATCH 22/22] i965/fb/gen6: Use meta path for stencil up/downsampling

Topi Pohjolainen topi.pohjolainen at intel.com
Mon Jun 9 00:45:56 PDT 2014


Signed-off-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
---
 src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 31 ++++-----------------------
 1 file changed, 4 insertions(+), 27 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
index dd7e57a..0da23ef 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
@@ -1653,36 +1653,13 @@ intel_miptree_updownsample(struct brw_context *brw,
                            struct intel_mipmap_tree *src,
                            struct intel_mipmap_tree *dst)
 {
-   if (brw->gen < 8) {
-      brw_blorp_blit_miptrees(brw,
-                              src, 0 /* level */, 0 /* layer */,
-                              dst, 0 /* level */, 0 /* layer */,
-                              0, 0,
-                              src->logical_width0, src->logical_height0,
-                              0, 0,
-                              dst->logical_width0, dst->logical_height0,
-                              GL_NEAREST, false, false /*mirror x, y*/);
-   } else if (src->format == MESA_FORMAT_S_UINT8) {
+   if (src->format == MESA_FORMAT_S_UINT8)
       brw_meta_stencil_updownsample(brw, src, dst);
-   } else {
+   else
       brw_meta_updownsample(brw, src, dst);
-   }
 
-   if (src->stencil_mt) {
-      if (brw->gen >= 8) {
-         brw_meta_stencil_updownsample(brw, src->stencil_mt, dst);
-         return;
-      }
-
-      brw_blorp_blit_miptrees(brw,
-                              src->stencil_mt, 0 /* level */, 0 /* layer */,
-                              dst->stencil_mt, 0 /* level */, 0 /* layer */,
-                              0, 0,
-                              src->logical_width0, src->logical_height0,
-                              0, 0,
-                              dst->logical_width0, dst->logical_height0,
-                              GL_NEAREST, false, false /*mirror x, y*/);
-   }
+   if (src->stencil_mt)
+      brw_meta_stencil_updownsample(brw, src->stencil_mt, dst);
 }
 
 void *
-- 
1.8.3.1



More information about the mesa-dev mailing list