projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 62f1926644a61de8e340a4f7743306f70a1a1f27..5ffdb76682c56aeb3ced0596587d8a1a5e5077eb 100644
(file)
--- a/
src/gallium/drivers/i915simple/i915_surface.c
+++ b/
src/gallium/drivers/i915simple/i915_surface.c
@@
-31,7
+31,7
@@
#include "pipe/p_defines.h"
#include "pipe/p_inlines.h"
#include "pipe/p_inlines.h"
#include "pipe/p_defines.h"
#include "pipe/p_inlines.h"
#include "pipe/p_inlines.h"
-#include "pipe/
p_winsys
.h"
+#include "pipe/
internal/p_winsys_screen
.h"
#include "util/u_tile.h"
#include "util/u_rect.h"
#include "util/u_tile.h"
#include "util/u_rect.h"
@@
-79,8
+79,8
@@
i915_surface_copy(struct pipe_context *pipe,
i915_copy_blit( i915_context(pipe),
do_flip,
dst->block.size,
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 );
}
}
(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,
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,
dst->buffer, dst->offset,
(short) dstx, (short) dsty,
(short) width, (short) height,