From: Stéphane Marchesin <marcheu@chromium.org>
Date: Tue, 28 Jun 2011 19:04:45 +0000 (-0700)
Subject: i915g: Fix staging texture uploads a bit.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bd1ee764421ed23eb12c9d8be2dabe97100ad080;p=mesa.git

i915g: Fix staging texture uploads a bit.

They still look corrupted, but at least now they don't look tiled any more.
---

diff --git a/src/gallium/drivers/i915/i915_resource_texture.c b/src/gallium/drivers/i915/i915_resource_texture.c
index 62ec580fd31..0b6424f8d16 100644
--- a/src/gallium/drivers/i915/i915_resource_texture.c
+++ b/src/gallium/drivers/i915/i915_resource_texture.c
@@ -981,11 +981,7 @@ i915_texture_create(struct pipe_screen *screen,
    else
       buf_usage = I915_NEW_TEXTURE;
 
-   if (tex->tiling == I915_TILE_NONE)
-      tex->buffer = iws->buffer_create(iws, tex->total_nblocksy * tex->stride,
-                                       buf_usage);
-   else
-      tex->buffer = iws->buffer_create_tiled(iws, &tex->stride, tex->total_nblocksy,
+   tex->buffer = iws->buffer_create_tiled(iws, &tex->stride, tex->total_nblocksy,
                                              &tex->tiling, buf_usage);
    if (!tex->buffer)
       goto fail;