Mesa (master): i915g: Fix staging texture uploads a bit.

[Stephane Marchesin]

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

Author: Stéphane Marchesin <marcheu at chromium.org>
Date:   Tue Jun 28 12:04:45 2011 -0700

i915g: Fix staging texture uploads a bit.

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

---

 src/gallium/drivers/i915/i915_resource_texture.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/i915/i915_resource_texture.c b/src/gallium/drivers/i915/i915_resource_texture.c
index 62ec580..0b6424f 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;