diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-11-06 11:13:27 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-11-06 11:14:28 +0000 |
| commit | cd3d86037746f3a03c4004c1e3ba6e8281344745 (patch) | |
| tree | 87fdba12c71a6aa4a8f822acc4003da83bcdf036 | |
| parent | 0b9408d972050cb02c1024926c406cd45508a158 (diff) | |
sna: Beware unsigned promotion of int16_t to uint32_t
Mmakes for an unhappy mempy!
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/blt.c | 2 | ||||
| -rw-r--r-- | src/sna/kgem.h | 2 | ||||
| -rw-r--r-- | src/sna/sna.h | 2 | ||||
| -rw-r--r-- | src/sna/sna_driver.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/sna/blt.c b/src/sna/blt.c index 075ac8a1..5dc318ca 100644 --- a/src/sna/blt.c +++ b/src/sna/blt.c @@ -38,7 +38,7 @@ void memcpy_blt(const void *src, void *dst, int bpp, - uint32_t src_stride, uint32_t dst_stride, + int32_t src_stride, int32_t dst_stride, int16_t src_x, int16_t src_y, int16_t dst_x, int16_t dst_y, uint16_t width, uint16_t height) diff --git a/src/sna/kgem.h b/src/sna/kgem.h index 3c4ad002..e801a150 100644 --- a/src/sna/kgem.h +++ b/src/sna/kgem.h @@ -64,7 +64,7 @@ struct kgem_bo { uint32_t size; uint32_t delta; - uint32_t pitch : 20; /* max 128k */ + uint32_t pitch : 18; /* max 128k */ uint32_t tiling : 2; uint32_t reusable : 1; uint32_t dirty : 1; diff --git a/src/sna/sna.h b/src/sna/sna.h index 9d0b7070..d79e9a85 100644 --- a/src/sna/sna.h +++ b/src/sna/sna.h @@ -641,7 +641,7 @@ sna_compute_composite_region(RegionPtr region, void memcpy_blt(const void *src, void *dst, int bpp, - uint32_t src_stride, uint32_t dst_stride, + int32_t src_stride, int32_t dst_stride, int16_t src_x, int16_t src_y, int16_t dst_x, int16_t dst_y, uint16_t width, uint16_t height); diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c index 77c0b4cc..9e493614 100644 --- a/src/sna/sna_driver.c +++ b/src/sna/sna_driver.c @@ -1034,7 +1034,7 @@ void sna_init_scrn(ScrnInfoPtr scrn, int entity_num) #endif DBG(("%s\n", __FUNCTION__)); - DBG(("pixman version: %d\n", pixman_version_string())); + DBG(("pixman version: %s\n", pixman_version_string())); sna_device_key = xf86AllocateEntityPrivateIndex(); |