summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/i965/brw_state_cache.c
diff options
context:
space:
mode:
authorKeith Whitwell <keithw@vmware.com>2009-11-04 13:03:35 +0000
committerKeith Whitwell <keithw@vmware.com>2009-11-04 13:03:35 +0000
commit211d7ab22b13430aaae00a0dfe95492450bcca20 (patch)
treedb312543dec8016161b9df2afa596412bf34fbeb /src/gallium/drivers/i965/brw_state_cache.c
parenta277bb20debc413f6ccf46f529497bf8bafa64dd (diff)
i965g: add standalone xlib debug winsys
Create a dummy winsys that just debug-prints on calls into the winsys functions. Will use this to get to the point where we are generating sane-looking debug dumps and diassembly. Also fix various warnings generated with the new compiler flags set in this config.
Diffstat (limited to 'src/gallium/drivers/i965/brw_state_cache.c')
-rw-r--r--src/gallium/drivers/i965/brw_state_cache.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/i965/brw_state_cache.c b/src/gallium/drivers/i965/brw_state_cache.c
index 9cf44f7a5c..1cb1b5e721 100644
--- a/src/gallium/drivers/i965/brw_state_cache.c
+++ b/src/gallium/drivers/i965/brw_state_cache.c
@@ -236,8 +236,8 @@ brw_upload_cache( struct brw_cache *cache,
tmp = MALLOC(key_size + aux_size + relocs_size);
memcpy(tmp, key, key_size);
- memcpy(tmp + key_size, aux, cache->aux_size[cache_id]);
- memcpy(tmp + key_size + aux_size, reloc_bufs, relocs_size);
+ memcpy((char *)tmp + key_size, aux, cache->aux_size[cache_id]);
+ memcpy((char *)tmp + key_size + aux_size, reloc_bufs, relocs_size);
for (i = 0; i < nr_reloc_bufs; i++) {
if (reloc_bufs[i] != NULL)
cache->sws->bo_reference(reloc_bufs[i]);
@@ -247,7 +247,7 @@ brw_upload_cache( struct brw_cache *cache,
item->key = tmp;
item->hash = hash;
item->key_size = key_size;
- item->reloc_bufs = tmp + key_size + aux_size;
+ item->reloc_bufs = (struct brw_winsys_buffer **)((char *)tmp + key_size + aux_size);
item->nr_reloc_bufs = nr_reloc_bufs;
item->bo = bo;