From: Topi Pohjolainen <topi.pohjolainen@intel.com>
Date: Tue, 7 Jun 2016 05:22:18 +0000 (+0300)
Subject: i965/fbo: Prepare layer multiplier for render buffer compression
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=07d070f324ff821e24a5c7bef028d04334e57c5a;p=mesa.git

i965/fbo: Prepare layer multiplier for render buffer compression

This path is not yet taken for fast cleared or compressed buffers
but later patches will enable it.

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

diff --git a/src/mesa/drivers/dri/i965/intel_fbo.c b/src/mesa/drivers/dri/i965/intel_fbo.c
index cb2ee8b3d25..de0cd6aca2f 100644
--- a/src/mesa/drivers/dri/i965/intel_fbo.c
+++ b/src/mesa/drivers/dri/i965/intel_fbo.c
@@ -540,7 +540,7 @@ intel_renderbuffer_update_wrapper(struct brw_context *brw,
    switch (mt->msaa_layout) {
       case INTEL_MSAA_LAYOUT_UMS:
       case INTEL_MSAA_LAYOUT_CMS:
-         layer_multiplier = mt->num_samples;
+         layer_multiplier = MAX2(mt->num_samples, 1);
          break;
 
       default: