diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-10-26 00:20:33 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-10-26 00:20:33 +0000 |
| commit | 09c231f84a20a306a173b60c82484ce1f9331edf (patch) | |
| tree | 1faaa20dc34e1d2b019f14c8ea0accd5ce558808 /src/gallium/drivers/i965/brw_state_batch.c | |
| parent | 590949553f737902008dea020420311e2085aa1a (diff) | |
i965g: still working on compilation
Diffstat (limited to 'src/gallium/drivers/i965/brw_state_batch.c')
| -rw-r--r-- | src/gallium/drivers/i965/brw_state_batch.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/i965/brw_state_batch.c b/src/gallium/drivers/i965/brw_state_batch.c index 324fce5163..7d212e5c24 100644 --- a/src/gallium/drivers/i965/brw_state_batch.c +++ b/src/gallium/drivers/i965/brw_state_batch.c @@ -46,7 +46,7 @@ GLboolean brw_cached_batch_struct( struct brw_context *brw, struct brw_cached_batch_item *item = brw->cached_batch_items; struct header *newheader = (struct header *)data; - if (brw->emit_state_always) { + if (brw->flags.always_emit_state) { brw_batchbuffer_data(brw->batch, data, sz, IGNORE_CLIPRECTS); return GL_TRUE; } @@ -56,8 +56,8 @@ GLboolean brw_cached_batch_struct( struct brw_context *brw, if (item->sz == sz && memcmp(item->header, newheader, sz) == 0) return GL_FALSE; if (item->sz != sz) { - _mesa_free(item->header); - item->header = _mesa_malloc(sz); + FREE(item->header); + item->header = MALLOC(sz); item->sz = sz; } goto emit; @@ -67,7 +67,7 @@ GLboolean brw_cached_batch_struct( struct brw_context *brw, assert(!item); item = CALLOC_STRUCT(brw_cached_batch_item); - item->header = _mesa_malloc(sz); + item->header = MALLOC(sz); item->sz = sz; item->next = brw->cached_batch_items; brw->cached_batch_items = item; |