Merge branch 'gallium-wgl-rework' into gallium-0.2

[mesa.git] / src / gallium / drivers / i915simple / i915_surface.c

diff --git a/src/gallium/drivers/i915simple/i915_surface.c b/src/gallium/drivers/i915simple/i915_surface.c
index 0061b22f2688ff114efd4f7969452ead8fe32489..5ffdb76682c56aeb3ced0596587d8a1a5e5077eb 100644 (file)
--- a/src/gallium/drivers/i915simple/i915_surface.c
+++ b/src/gallium/drivers/i915simple/i915_surface.c
@@ -30,10 +30,10 @@
 #include "i915_state.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_inlines.h"
-#include "pipe/p_util.h"
 #include "pipe/p_inlines.h"
-#include "pipe/p_winsys.h"
-#include "util/p_tile.h"
+#include "pipe/internal/p_winsys_screen.h"
+#include "util/u_tile.h"
+#include "util/u_rect.h"
 
 
 /* Assumes all values are within bounds -- no checking at this level -
@@ -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,
+                     (unsigned short) src->stride, src->buffer, src->offset,
+                     (unsigned 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, 
+                     (unsigned short) dst->stride,
                      dst->buffer, dst->offset,
-                     (short) dstx, (short) dsty, 
-                     (short) width, (short) height, 
+                     (short) dstx, (short) dsty,
+                     (short) width, (short) height,
                      value );
    }
 }