fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-07 18:40:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r300g: replace r300_cs_info with simplier get_cs_free_dwords

Browse source
This commit is contained in:
Marek Olšák 2010-06-12 22:07:41 +02:00
parent 7d5230ce90
commit ae182296ce
4 changed files with 9 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gallium/drivers/r300/r300_context.c
View file

@ -242,10 +242,7 @@ struct pipe_context* r300_create_context(struct pipe_screen* screen,
boolean r300_check_cs(struct r300_context *r300, unsigned size)
{
struct r300_cs_info cs_info;
r300->rws->get_cs_info(r300->rws, &cs_info);
return size <= cs_info.free;
return size <= r300->rws->get_cs_free_dwords(r300->rws);
}
void r300_finish(struct r300_context *r300)

6
src/gallium/drivers/r300/r300_render.c
View file

@ -913,7 +913,7 @@ static void r300_render_draw_elements(struct vbuf_render* render,
unsigned max_index = (r300render->vbo_size - r300render->vbo_offset) /
(r300render->r300->vertex_info.size * 4) - 1;
unsigned short_count;
struct r300_cs_info cs_info;
unsigned free_dwords;
CS_LOCALS(r300);
@ -926,9 +926,9 @@ static void r300_render_draw_elements(struct vbuf_render* render,
NULL, 256, 0, 0, &end_cs_dwords);
while (count) {
r300->rws->get_cs_info(r300->rws, &cs_info);
free_dwords = r300->rws->get_cs_free_dwords(r300->rws);
short_count = MIN2(count, (cs_info.free - end_cs_dwords - 6) * 2);
short_count = MIN2(count, (free_dwords - end_cs_dwords - 6) * 2);
BEGIN_CS(6 + (short_count+1)/2);
OUT_CS_REG(R300_GA_COLOR_CONTROL,

12
src/gallium/drivers/r300/r300_winsys.h
View file

@ -47,13 +47,6 @@ enum r300_reference_domain { /* bitfield */
R300_REF_HW = 2
};
struct r300_cs_info {
/* In DWORDs. */
unsigned used;
unsigned free;
unsigned capacity;
};
struct r300_winsys_screen {
void (*destroy)(struct r300_winsys_screen *ws);
@ -109,9 +102,8 @@ struct r300_winsys_screen {
* Returns TRUE if a flush is required. */
boolean (*validate)(struct r300_winsys_screen* winsys);
/* Return current CS info. */
void (*get_cs_info)(struct r300_winsys_screen *winsys,
struct r300_cs_info *info);
/* Return the number of free dwords in CS. */
unsigned (*get_cs_free_dwords)(struct r300_winsys_screen *winsys);
/* Start a command emit. */
void (*begin_cs)(struct r300_winsys_screen* winsys,

9
src/gallium/winsys/radeon/drm/radeon_r300.c
View file

@ -192,15 +192,12 @@ static boolean radeon_validate(struct r300_winsys_screen *rws)
return TRUE;
}
static void radeon_get_cs_info(struct r300_winsys_screen *rws,
struct r300_cs_info *info)
static unsigned radeon_get_cs_free_dwords(struct r300_winsys_screen *rws)
{
struct radeon_libdrm_winsys *ws = radeon_winsys_screen(rws);
struct radeon_cs *cs = ws->cs;
info->capacity = cs->ndw;
info->used = cs->cdw;
info->free = cs->ndw - cs->cdw;
return cs->ndw - cs->cdw;
}
static void radeon_begin_cs(struct r300_winsys_screen *rws,
@ -345,7 +342,7 @@ radeon_setup_winsys(int fd, struct radeon_libdrm_winsys* ws)
ws->base.add_buffer = radeon_add_buffer;
ws->base.validate = radeon_validate;
ws->base.destroy = radeon_winsys_destroy;
ws->base.get_cs_info = radeon_get_cs_info;
ws->base.get_cs_free_dwords = radeon_get_cs_free_dwords;
ws->base.begin_cs = radeon_begin_cs;
ws->base.write_cs_dword = radeon_write_cs_dword;
ws->base.write_cs_table = radeon_write_cs_table;