i915g: Fix staging texture uploads a bit.
authorStéphane Marchesin <marcheu@chromium.org>
Tue, 28 Jun 2011 19:04:45 +0000 (12:04 -0700)
committerStéphane Marchesin <marcheu@chromium.org>
Tue, 28 Jun 2011 19:05:28 +0000 (12:05 -0700)
They still look corrupted, but at least now they don't look tiled any more.

src/gallium/drivers/i915/i915_resource_texture.c

index 62ec580..0b6424f 100644 (file)
@@ -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;