From: José Fonseca <jfonseca@vmware.com>
Date: Thu, 27 May 2010 15:17:06 +0000 (+0100)
Subject: llvmpipe: Call llvmpipe_set_texture_tile_layout only when necessary.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=82715bb2279b0ddd063d41dd7d52e8fd76c921f4;p=mesa.git

llvmpipe: Call llvmpipe_set_texture_tile_layout only when necessary.

Like the other places.
---

diff --git a/src/gallium/drivers/llvmpipe/lp_texture.c b/src/gallium/drivers/llvmpipe/lp_texture.c
index 5696683f454..d86056ca34c 100644
--- a/src/gallium/drivers/llvmpipe/lp_texture.c
+++ b/src/gallium/drivers/llvmpipe/lp_texture.c
@@ -1045,6 +1045,7 @@ llvmpipe_get_texture_image(struct llvmpipe_resource *lpr,
                                      lpr->tiles_per_row[level]);
                }
                else {
+                  assert(layout == LP_TEX_LAYOUT_LINEAR);
                   lp_tiled_to_linear(other_data, target_data,
                                      x * TILE_SIZE, y * TILE_SIZE,
                                      TILE_SIZE, TILE_SIZE,
@@ -1054,8 +1055,9 @@ llvmpipe_get_texture_image(struct llvmpipe_resource *lpr,
                }
             }
 
-            llvmpipe_set_texture_tile_layout(lpr, face_slice, level, x, y,
-                                             new_layout);
+            if (new_layout != cur_layout)
+               llvmpipe_set_texture_tile_layout(lpr, face_slice, level, x, y,
+                                                new_layout);
          }
       }
    }