diff options
author | José Fonseca <[email protected]> | 2009-01-30 14:07:12 +0000 |
---|---|---|
committer | José Fonseca <[email protected]> | 2009-01-30 14:07:12 +0000 |
commit | 46edad7d29b6f65de46b9c9da6f66eb0b12e3f8c (patch) | |
tree | 2720cec2d7b8692f32fb64099f166bf2cda03f35 /src/gallium/drivers/i915simple/i915_surface.c | |
parent | b3028acd98e2b7fd09344f9005c5b20bba91262c (diff) | |
parent | 7996b3e034f92eeceed3f3e7c01eb1f829d98b18 (diff) |
Merge branch 'gallium-0.2' into gallium-winsys-private
Diffstat (limited to 'src/gallium/drivers/i915simple/i915_surface.c')
-rw-r--r-- | src/gallium/drivers/i915simple/i915_surface.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/i915simple/i915_surface.c b/src/gallium/drivers/i915simple/i915_surface.c index 62f1926644a..3b3d9217a0c 100644 --- a/src/gallium/drivers/i915simple/i915_surface.c +++ b/src/gallium/drivers/i915simple/i915_surface.c @@ -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->buffer, src->offset, - (short) dst->stride, 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,7 +106,7 @@ i915_surface_fill(struct pipe_context *pipe, assert(dst->block.height == 1); i915_fill_blit( i915_context(pipe), dst->block.size, - (short) dst->stride, + (unsigned short) dst->stride, dst->buffer, dst->offset, (short) dstx, (short) dsty, (short) width, (short) height, |