From 5b9d823545ec588ea97cc599a278626b99430d81 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Fri, 27 Jun 2008 14:16:42 +0200
Subject: i915: Fix the last of the stride/pitch changes

---
 src/gallium/drivers/i915simple/i915_surface.c    | 18 +++++++++---------
 src/gallium/winsys/dri/intel/intel_screen.c      |  4 ++--
 src/gallium/winsys/dri/intel/intel_swapbuffers.c |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/gallium/drivers/i915simple/i915_surface.c b/src/gallium/drivers/i915simple/i915_surface.c
index 0061b22f26..4430e81626 100644
--- a/src/gallium/drivers/i915simple/i915_surface.c
+++ b/src/gallium/drivers/i915simple/i915_surface.c
@@ -64,10 +64,10 @@ i915_surface_copy(struct pipe_context *pipe,
       pipe_copy_rect(dst_map,
                      &dst->block,
                      dst->stride,
-                     dstx, dsty, 
-                     width, height, 
-                     src_map, 
-                     do_flip ? -(int) src->stride : src->stride, 
+                     dstx, dsty,
+                     width, height,
+                     src_map,
+                     do_flip ? -(int) src->stride : src->stride,
                      srcx, do_flip ? height - 1 - srcy : srcy);
 
       pipe->screen->surface_unmap(pipe->screen, src);
@@ -79,8 +79,8 @@ i915_surface_copy(struct pipe_context *pipe,
       i915_copy_blit( i915_context(pipe),
                       do_flip,
                       dst->block.size,
-		      (short) src->stride/src->block.size, src->buffer, src->offset,
-		      (short) dst->stride/dst->block.size, dst->buffer, dst->offset,
+		      (short) src->stride, src->buffer, src->offset,
+		      (short) dst->stride, dst->buffer, dst->offset,
 		      (short) srcx, (short) srcy, (short) dstx, (short) dsty, (short) width, (short) height );
    }
 }
@@ -106,10 +106,10 @@ i915_surface_fill(struct pipe_context *pipe,
       assert(dst->block.height == 1);
       i915_fill_blit( i915_context(pipe),
 		      dst->block.size,
-		      (short) dst->stride/dst->block.size, 
+		      (short) dst->stride,
 		      dst->buffer, dst->offset,
-		      (short) dstx, (short) dsty, 
-		      (short) width, (short) height, 
+		      (short) dstx, (short) dsty,
+		      (short) width, (short) height,
 		      value );
    }
 }
diff --git a/src/gallium/winsys/dri/intel/intel_screen.c b/src/gallium/winsys/dri/intel/intel_screen.c
index 18427a4586..89de188ada 100644
--- a/src/gallium/winsys/dri/intel/intel_screen.c
+++ b/src/gallium/winsys/dri/intel/intel_screen.c
@@ -78,10 +78,10 @@ intelCreateSurface(struct intel_screen *intelScreen, struct pipe_winsys *winsys,
    templat.last_level = 0;
    templat.depth[0] = 1;
    templat.format = PIPE_FORMAT_A8R8G8B8_UNORM;
-   templat.cpp = intelScreen->front.cpp;
    templat.width[0] = intelScreen->front.width;
    templat.height[0] = intelScreen->front.height;
-   pitch = intelScreen->front.pitch / intelScreen->front.cpp;
+   pf_get_block(templat.format, &templat.block);
+   pitch = intelScreen->front.pitch;
 
    texture = screen->texture_blanket(screen,
                                      &templat,
diff --git a/src/gallium/winsys/dri/intel/intel_swapbuffers.c b/src/gallium/winsys/dri/intel/intel_swapbuffers.c
index 7f3babd98e..f58da97c64 100644
--- a/src/gallium/winsys/dri/intel/intel_swapbuffers.c
+++ b/src/gallium/winsys/dri/intel/intel_swapbuffers.c
@@ -89,7 +89,7 @@ intelDisplaySurface(__DRIdrawablePrivate *dPriv,
       const drm_clip_rect_t *pbox = dPriv->pClipRects;
       const int pitch = intelScreen->front.pitch / intelScreen->front.cpp;
       const int cpp = intelScreen->front.cpp;
-      const int srcpitch = surf->pitch;
+      const int srcpitch = surf->stride / cpp;
       int BR13, CMD;
       int i;
 
-- 
cgit v1.2.3