[Mesa-dev] [PATCH v2 17/27] i965/blorp: Stop calling brw_meta_get_buffer_rect

[Jason Ekstrand]

We already have an inlined version of the function slightly higher up in
do_single_blorp_clear and all calling it does is stomp the values with the
same thing.  We might as well just get rid of it.
---
 src/mesa/drivers/dri/i965/brw_blorp_clear.cpp |  3 ---
 src/mesa/drivers/dri/i965/brw_meta_util.c     | 16 ----------------
 src/mesa/drivers/dri/i965/brw_meta_util.h     |  5 -----
 3 files changed, 24 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_blorp_clear.cpp b/src/mesa/drivers/dri/i965/brw_blorp_clear.cpp
index d574eac..f67a1a4 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp_clear.cpp
+++ b/src/mesa/drivers/dri/i965/brw_blorp_clear.cpp
@@ -174,9 +174,6 @@ do_single_blorp_clear(struct brw_context *brw, struct gl_framebuffer *fb,
 
       brw_get_fast_clear_rect(brw, fb, irb->mt, &params.x0, &params.y0,
                               &params.x1, &params.y1);
-   } else {
-      brw_meta_get_buffer_rect(fb, &params.x0, &params.y0,
-                               &params.x1, &params.y1);
    }
 
    brw_blorp_params_get_clear_kernel(brw, &params, use_simd16_replicated_data);
diff --git a/src/mesa/drivers/dri/i965/brw_meta_util.c b/src/mesa/drivers/dri/i965/brw_meta_util.c
index a81190d..59c9af8 100644
--- a/src/mesa/drivers/dri/i965/brw_meta_util.c
+++ b/src/mesa/drivers/dri/i965/brw_meta_util.c
@@ -569,22 +569,6 @@ brw_get_fast_clear_rect(const struct brw_context *brw,
 }
 
 void
-brw_meta_get_buffer_rect(const struct gl_framebuffer *fb,
-                         unsigned *x0, unsigned *y0,
-                         unsigned *x1, unsigned *y1)
-{
-   *x0 = fb->_Xmin;
-   *x1 = fb->_Xmax;
-   if (fb->Name != 0) {
-      *y0 = fb->_Ymin;
-      *y1 = fb->_Ymax;
-   } else {
-      *y0 = fb->Height - fb->_Ymax;
-      *y1 = fb->Height - fb->_Ymin;
-   }
-}
-
-void
 brw_get_ccs_resolve_rect(const struct isl_device *dev,
                          const struct isl_surf *ccs_surf,
                          unsigned *x0, unsigned *y0,
diff --git a/src/mesa/drivers/dri/i965/brw_meta_util.h b/src/mesa/drivers/dri/i965/brw_meta_util.h
index 7d4e5f6..198ffe5 100644
--- a/src/mesa/drivers/dri/i965/brw_meta_util.h
+++ b/src/mesa/drivers/dri/i965/brw_meta_util.h
@@ -55,11 +55,6 @@ brw_get_ccs_resolve_rect(const struct isl_device *dev,
                          unsigned *x0, unsigned *y0,
                          unsigned *x1, unsigned *y1);
 
-void
-brw_meta_get_buffer_rect(const struct gl_framebuffer *fb, 
-                         unsigned *x0, unsigned *y0,
-                         unsigned *x1, unsigned *y1);
-
 bool
 brw_meta_set_fast_clear_color(struct brw_context *brw,
                               struct intel_mipmap_tree *mt,
-- 
2.5.0.400.gff86faf