Mesa (master): ilo: fix padding of linear sampler views

[Chia-I Wu]

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

Author: Chia-I Wu <olvaffe at gmail.com>
Date:   Fri Mar  6 15:10:45 2015 +0800

ilo: fix padding of linear sampler views

Should use the temporary variable in the loop instead of layout->bo_height.

---

 src/gallium/drivers/ilo/ilo_layout.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/ilo/ilo_layout.c b/src/gallium/drivers/ilo/ilo_layout.c
index a99e445..2c78dc6 100644
--- a/src/gallium/drivers/ilo/ilo_layout.c
+++ b/src/gallium/drivers/ilo/ilo_layout.c
@@ -908,10 +908,8 @@ layout_calculate_bo_size(struct ilo_layout *layout,
        */
       if (ilo_dev_gen(params->dev) >= ILO_GEN(7.5) &&
           (params->templ->bind & PIPE_BIND_SAMPLER_VIEW) &&
-          layout->tiling == GEN6_TILING_NONE) {
-         layout->bo_height +=
-            (64 + layout->bo_stride - 1) / layout->bo_stride;
-      }
+          layout->tiling == GEN6_TILING_NONE)
+         h += (64 + layout->bo_stride - 1) / layout->bo_stride;
 
       /*
        * From the Sandy Bridge PRM, volume 4 part 1, page 81: