From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Fri, 19 Aug 2016 07:37:38 +0000 (-0700)
Subject: i965/meta_util: Take an isl_device in get_fast_clear_rect
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a818a322440d667a5c143647d070fbc06eb7c328;p=mesa.git

i965/meta_util: Take an isl_device in get_fast_clear_rect

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
---

diff --git a/src/mesa/drivers/dri/i965/blorp_clear.c b/src/mesa/drivers/dri/i965/blorp_clear.c
index afb54756385..73b55bd0920 100644
--- a/src/mesa/drivers/dri/i965/blorp_clear.c
+++ b/src/mesa/drivers/dri/i965/blorp_clear.c
@@ -110,8 +110,8 @@ blorp_fast_clear(struct brw_context *brw, const struct brw_blorp_surf *surf,
    memset(&params.wm_inputs, 0xff, 4*sizeof(float));
    params.fast_clear_op = GEN7_PS_RENDER_TARGET_FAST_CLEAR_ENABLE;
 
-   brw_get_fast_clear_rect(brw, surf->aux_surf, &params.x0, &params.y0,
-                           &params.x1, &params.y1);
+   brw_get_fast_clear_rect(&brw->isl_dev, surf->aux_surf,
+                           &params.x0, &params.y0, &params.x1, &params.y1);
 
    brw_blorp_params_get_clear_kernel(brw, &params, true);
 
diff --git a/src/mesa/drivers/dri/i965/brw_meta_util.c b/src/mesa/drivers/dri/i965/brw_meta_util.c
index 90f03452315..bc3a62d6319 100644
--- a/src/mesa/drivers/dri/i965/brw_meta_util.c
+++ b/src/mesa/drivers/dri/i965/brw_meta_util.c
@@ -446,7 +446,7 @@ brw_meta_set_fast_clear_color(struct brw_context *brw,
  * area of the framebuffer to be cleared.
  */
 void
-brw_get_fast_clear_rect(const struct brw_context *brw,
+brw_get_fast_clear_rect(const struct isl_device *dev,
                         const struct isl_surf *aux_surf,
                         unsigned *x0, unsigned *y0,
                         unsigned *x1, unsigned *y1)
@@ -479,7 +479,7 @@ brw_get_fast_clear_rect(const struct brw_context *brw,
       /* SKL+ line alignment requirement for Y-tiled are half those of the prior
        * generations.
        */
-      if (brw->gen >= 9)
+      if (dev->info->gen >= 9)
          y_align *= 16;
       else
          y_align *= 32;
diff --git a/src/mesa/drivers/dri/i965/brw_meta_util.h b/src/mesa/drivers/dri/i965/brw_meta_util.h
index 861392142ba..79a777f991b 100644
--- a/src/mesa/drivers/dri/i965/brw_meta_util.h
+++ b/src/mesa/drivers/dri/i965/brw_meta_util.h
@@ -43,7 +43,7 @@ brw_meta_mirror_clip_and_scissor(const struct gl_context *ctx,
                                  bool *mirror_x, bool *mirror_y);
 
 void
-brw_get_fast_clear_rect(const struct brw_context *brw,
+brw_get_fast_clear_rect(const struct isl_device *dev,
                         const struct isl_surf *aux_surf,
                         unsigned *x0, unsigned *y0,
                         unsigned *x1, unsigned *y1);