Mesa (master): i965/fbo: Prepare layer multiplier for render buffer compression

[Topi Pohjolainen]

Module: Mesa
Branch: master
Commit: 07d070f324ff821e24a5c7bef028d04334e57c5a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=07d070f324ff821e24a5c7bef028d04334e57c5a

Author: Topi Pohjolainen <topi.pohjolainen at intel.com>
Date:   Tue Jun  7 08:22:18 2016 +0300

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 at intel.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

---

 src/mesa/drivers/dri/i965/intel_fbo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/intel_fbo.c b/src/mesa/drivers/dri/i965/intel_fbo.c
index cb2ee8b..de0cd6a 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: