i965/blorp: Mark branch unreachable to silence uninitialized var warning.

[mesa.git] / src / mesa / drivers / dri / i965 / brw_blorp_clear.cpp

diff --git a/src/mesa/drivers/dri/i965/brw_blorp_clear.cpp b/src/mesa/drivers/dri/i965/brw_blorp_clear.cpp
index 9159df5978c932e0b1a74de127091ac95fca1c3d..17d932517321231ef83d44121f913fcb240c7a6b 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_blorp_clear.cpp
+++ b/src/mesa/drivers/dri/i965/brw_blorp_clear.cpp
@@ -56,7 +56,6 @@ public:
    virtual uint32_t get_wm_prog(struct brw_context *brw,
                                 brw_blorp_prog_data **prog_data) const;
 
-protected:
    brw_blorp_const_color_prog_key wm_prog_key;
 };
 
@@ -154,9 +153,8 @@ is_color_fast_clear_compatible(struct brw_context *brw,
       return false;
 
    for (int i = 0; i < 4; i++) {
-      if (color->f[i] != 0.0 && color->f[i] != 1.0) {
-         perf_debug("Clear color unsupported by fast color clear.  "
-                    "Falling back to slow clear.\n");
+      if (color->f[i] != 0.0 && color->f[i] != 1.0 &&
+          _mesa_format_has_color_component(format, i)) {
          return false;
       }
    }
@@ -225,14 +223,15 @@ brw_blorp_clear_params::brw_blorp_clear_params(struct brw_context *brw,
     *      accessing tiled memory.  Using this Message Type to access linear
     *      (untiled) memory is UNDEFINED."
     */
-   if (irb->mt->region->tiling == I915_TILING_NONE)
+   if (irb->mt->tiling == I915_TILING_NONE)
       wm_prog_key.use_simd16_replicated_data = false;
 
    /* Constant color writes ignore everyting in blend and color calculator
     * state.  This is not documented.
     */
    for (int i = 0; i < 4; i++) {
-      if (!color_mask[i]) {
+      if (_mesa_format_has_color_component(irb->mt->format, i) &&
+          !color_mask[i]) {
          color_write_disable[i] = true;
          wm_prog_key.use_simd16_replicated_data = false;
       }
@@ -341,6 +340,7 @@ brw_blorp_clear_params::brw_blorp_clear_params(struct brw_context *brw,
             break;
          default:
             assert(!"Unexpected sample count for fast clear");
+            unreachable();
             break;
          }
          y_scaledown = 2;
@@ -441,7 +441,7 @@ brw_blorp_const_color_program::compile(struct brw_context *brw,
 
    alloc_regs();
 
-   brw_set_compression_control(&func, BRW_COMPRESSION_NONE);
+   brw_set_default_compression_control(&func, BRW_COMPRESSION_NONE);
 
    struct brw_reg mrf_rt_write =
       retype(vec16(brw_message_reg(base_mrf)), BRW_REGISTER_TYPE_F);
@@ -451,9 +451,9 @@ brw_blorp_const_color_program::compile(struct brw_context *brw,
       /* The message payload is a single register with the low 4 floats/ints
        * filled with the constant clear color.
        */
-      brw_set_mask_control(&func, BRW_MASK_DISABLE);
+      brw_set_default_mask_control(&func, BRW_MASK_DISABLE);
       brw_MOV(&func, vec4(brw_message_reg(base_mrf)), clear_rgba);
-      brw_set_mask_control(&func, BRW_MASK_ENABLE);
+      brw_set_default_mask_control(&func, BRW_MASK_ENABLE);
 
       msg_type = BRW_DATAPORT_RENDER_TARGET_WRITE_SIMD16_SINGLE_SOURCE_REPLICATED;
       mlen = 1;
@@ -462,11 +462,11 @@ brw_blorp_const_color_program::compile(struct brw_context *brw,
          /* The message payload is pairs of registers for 16 pixels each of r,
           * g, b, and a.
           */
-         brw_set_compression_control(&func, BRW_COMPRESSION_COMPRESSED);
+         brw_set_default_compression_control(&func, BRW_COMPRESSION_COMPRESSED);
          brw_MOV(&func,
                  brw_message_reg(base_mrf + i * 2),
                  brw_vec1_grf(clear_rgba.nr, i));
-         brw_set_compression_control(&func, BRW_COMPRESSION_NONE);
+         brw_set_default_compression_control(&func, BRW_COMPRESSION_NONE);
       }
 
       msg_type = BRW_DATAPORT_RENDER_TARGET_WRITE_SIMD16_SINGLE_SOURCE;
@@ -486,10 +486,12 @@ brw_blorp_const_color_program::compile(struct brw_context *brw,
                 false /* header present */);
 
    if (unlikely(INTEL_DEBUG & DEBUG_BLORP)) {
-      printf("Native code for BLORP clear:\n");
-      brw_dump_compile(&func, stdout, 0, func.next_insn_offset);
-      printf("\n");
+      fprintf(stderr, "Native code for BLORP clear:\n");
+      brw_disassemble(brw, func.store, 0, func.next_insn_offset, stderr);
+      fprintf(stderr, "\n");
    }
+
+   brw_compact_instructions(&func, 0, 0, NULL);
    return brw_get_program(&func, program_size);
 }
 
@@ -540,7 +542,15 @@ do_single_blorp_clear(struct brw_context *brw, struct gl_framebuffer *fb,
       }
    }
 
-   DBG("%s to mt %p level %d layer %d\n", __FUNCTION__,
+   const char *clear_type;
+   if (is_fast_clear)
+      clear_type = "fast";
+   else if (params.wm_prog_key.use_simd16_replicated_data)
+      clear_type = "replicated";
+   else
+      clear_type = "slow";
+
+   DBG("%s (%s) to mt %p level %d layer %d\n", __FUNCTION__, clear_type,
        irb->mt, irb->mt_level, irb->mt_layer);
 
    brw_blorp_exec(brw, &params);
@@ -560,12 +570,16 @@ do_single_blorp_clear(struct brw_context *brw, struct gl_framebuffer *fb,
 extern "C" {
 bool
 brw_blorp_clear_color(struct brw_context *brw, struct gl_framebuffer *fb,
-                      bool partial_clear)
+                      GLbitfield mask, bool partial_clear)
 {
    for (unsigned buf = 0; buf < fb->_NumColorDrawBuffers; buf++) {
       struct gl_renderbuffer *rb = fb->_ColorDrawBuffers[buf];
       struct intel_renderbuffer *irb = intel_renderbuffer(rb);
 
+      /* Only clear the buffers present in the provided mask */
+      if (((1 << fb->_ColorDrawBufferIndexes[buf]) & mask) == 0)
+         continue;
+
       /* If this is an ES2 context or GL_ARB_ES2_compatibility is supported,
        * the framebuffer can be complete with some attachments missing.  In
        * this case the _ColorDrawBuffers pointer will be NULL.
@@ -578,11 +592,10 @@ brw_blorp_clear_color(struct brw_context *brw, struct gl_framebuffer *fb,
             (irb->mt->msaa_layout == INTEL_MSAA_LAYOUT_UMS ||
              irb->mt->msaa_layout == INTEL_MSAA_LAYOUT_CMS) ?
             irb->mt->num_samples : 1;
-         unsigned num_layers =
-            irb->mt->level[irb->mt_level].depth / layer_multiplier;
+         unsigned num_layers = irb->layer_count;
          for (unsigned layer = 0; layer < num_layers; layer++) {
             if (!do_single_blorp_clear(brw, fb, rb, buf, partial_clear,
-                                       layer * layer_multiplier)) {
+                                       irb->mt_layer + layer * layer_multiplier)) {
                return false;
             }
          }