<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Tue, Nov 14, 2017 at 9:34 AM, Lionel Landwerlin <span dir="ltr"><<a href="mailto:lionel.g.landwerlin@intel.com" target="_blank">lionel.g.landwerlin@intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">On 13/11/17 16:12, Jason Ekstrand wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
---<br>
  src/intel/blorp/blorp.h               | 3 ++-<br>
  src/intel/blorp/blorp_clear.c         | 7 +++++--<br>
  src/mesa/drivers/dri/i965/brw_<wbr>blorp.c | 2 +-<br>
  3 files changed, 8 insertions(+), 4 deletions(-)<br>
<br>
diff --git a/src/intel/blorp/blorp.h b/src/intel/blorp/blorp.h<br>
index c3077aa..690e65f 100644<br>
--- a/src/intel/blorp/blorp.h<br>
+++ b/src/intel/blorp/blorp.h<br>
@@ -202,7 +202,8 @@ enum blorp_fast_clear_op {<br>
    void<br>
  blorp_ccs_resolve(struct blorp_batch *batch,<br>
-                  struct blorp_surf *surf, uint32_t level, uint32_t layer,<br>
+                  struct blorp_surf *surf, uint32_t level,<br>
+                  uint32_t start_layer, uint32_t num_layers,<br>
                    enum isl_format format,<br>
                    enum blorp_fast_clear_op resolve_op);<br>
  diff --git a/src/intel/blorp/blorp_clear.<wbr>c b/src/intel/blorp/blorp_clear.<wbr>c<br>
index 8d758df..56cc3dd 100644<br>
--- a/src/intel/blorp/blorp_clear.<wbr>c<br>
+++ b/src/intel/blorp/blorp_clear.<wbr>c<br>
@@ -778,13 +778,16 @@ prepare_ccs_resolve(struct blorp_batch * const batch,<br>
    void<br>
  blorp_ccs_resolve(struct blorp_batch *batch,<br>
-                  struct blorp_surf *surf, uint32_t level, uint32_t layer,<br>
+                  struct blorp_surf *surf, uint32_t level,<br>
+                  uint32_t start_layer, uint32_t num_layers,<br>
                    enum isl_format format,<br>
                    enum blorp_fast_clear_op resolve_op)<br>
  {<br>
     struct blorp_params params;<br>
  -   prepare_ccs_resolve(batch, &params, surf, level, layer, format, resolve_op);<br>
+   prepare_ccs_resolve(batch, &params, surf, level, start_layer,<br>
+                       format, resolve_op);<br>
+   params.num_layers = num_layers;<br>
</blockquote>
<br></div></div>
Ohoh... Was num_layers uninitialized before this patch?<br></blockquote><div><br></div><div>No, prepare_ccs_resolve calls blorp_params_init() which sets it to 1.<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Otherwise looks good :<br>
<br>
Reviewed-by: Lionel Landwerlin <<a href="mailto:lionel.g.landwerlin@intel.com" target="_blank">lionel.g.landwerlin@intel.com</a><wbr>></blockquote><div class="h5"><br></div><div class="h5">Thanks!<br></div><div class="h5"><br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
       batch->blorp->exec(batch, &params);<br>
  }<br>
diff --git a/src/mesa/drivers/dri/i965/br<wbr>w_blorp.c b/src/mesa/drivers/dri/i965/br<wbr>w_blorp.c<br>
index eae8aaa..0736583 100644<br>
--- a/src/mesa/drivers/dri/i965/br<wbr>w_blorp.c<br>
+++ b/src/mesa/drivers/dri/i965/br<wbr>w_blorp.c<br>
@@ -1486,7 +1486,7 @@ brw_blorp_resolve_color(struct brw_context *brw, struct intel_mipmap_tree *mt,<br>
       struct blorp_batch batch;<br>
     blorp_batch_init(&brw->blorp, &batch, brw, 0);<br>
-   blorp_ccs_resolve(&batch, &surf, level, layer,<br>
+   blorp_ccs_resolve(&batch, &surf, level, layer, 1,<br>
                       brw_blorp_to_isl_format(brw, format, true),<br>
                       resolve_op);<br>
     blorp_batch_finish(&batch);<br>
</blockquote>
<br>
<br>
</div></div><br></div></div>