diff options
author | Marek Olšák <maraeo@gmail.com> | 2011-04-18 02:39:50 +0200 |
---|---|---|
committer | Marek Olšák <maraeo@gmail.com> | 2011-04-18 02:52:32 +0200 |
commit | d35aeff4bb0b03450b2c3c08bd7f84db5bf43283 (patch) | |
tree | 7572cae9f9022991404b3a9d74882858062fe095 /src/gallium/drivers/r300/r300_render.c | |
parent | f79717d27aaf471b9cd6eed0d74cbf37ec697361 (diff) | |
download | external_mesa3d-d35aeff4bb0b03450b2c3c08bd7f84db5bf43283.zip external_mesa3d-d35aeff4bb0b03450b2c3c08bd7f84db5bf43283.tar.gz external_mesa3d-d35aeff4bb0b03450b2c3c08bd7f84db5bf43283.tar.bz2 |
r300g/winsys: rename r300->radeon and do a little cleanup
Renaming a few files, types, and functions.
Also make the winsys independent of r300g.
Diffstat (limited to 'src/gallium/drivers/r300/r300_render.c')
-rw-r--r-- | src/gallium/drivers/r300/r300_render.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/r300/r300_render.c b/src/gallium/drivers/r300/r300_render.c index 26594da..429b855 100644 --- a/src/gallium/drivers/r300/r300_render.c +++ b/src/gallium/drivers/r300/r300_render.c @@ -218,8 +218,8 @@ static boolean r300_reserve_cs_dwords(struct r300_context *r300, cs_dwords += r300_get_num_cs_end_dwords(r300); /* Reserve requested CS space. */ - if (cs_dwords > (R300_MAX_CMDBUF_DWORDS - r300->cs->cdw)) { - r300_flush(&r300->context, R300_FLUSH_ASYNC, NULL); + if (cs_dwords > (RADEON_MAX_CMDBUF_DWORDS - r300->cs->cdw)) { + r300_flush(&r300->context, RADEON_FLUSH_ASYNC, NULL); flushed = TRUE; } @@ -343,7 +343,7 @@ static boolean immd_is_good_idea(struct r300_context *r300, if (!checked[vbi]) { buf = r300->vbuf_mgr->real_vertex_buffer[vbi]; - if ((r300_resource(buf)->domain != R300_DOMAIN_GTT)) { + if ((r300_resource(buf)->domain != RADEON_DOMAIN_GTT)) { return FALSE; } @@ -1080,7 +1080,7 @@ static void r300_render_draw_elements(struct vbuf_render* render, end_cs_dwords = r300_get_num_cs_end_dwords(r300); while (count) { - free_dwords = R300_MAX_CMDBUF_DWORDS - r300->cs->cdw; + free_dwords = RADEON_MAX_CMDBUF_DWORDS - r300->cs->cdw; short_count = MIN2(count, (free_dwords - end_cs_dwords - 6) * 2); |