fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

r300g: remove useless code

Browse source
This commit is contained in:
Marek Olšák 2011-10-28 17:44:02 +02:00
parent 68657183b0
commit 671af44b19
4 changed files with 3 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -62,7 +62,6 @@ static void r300_release_referenced_objects(struct r300_context *r300)
(struct pipe_framebuffer_state*)r300->fb_state.state;
struct r300_textures_state *textures =
(struct r300_textures_state*)r300->textures_state.state;
struct r300_query *query, *temp;
unsigned i;
/* Framebuffer state. */
@ -84,12 +83,6 @@ static void r300_release_referenced_objects(struct r300_context *r300)
pipe_resource_reference(&r300->dummy_vb, NULL);
pipe_resource_reference(&r300->vbo, NULL);
/* If there are any queries pending or not destroyed, remove them now. */
foreach_s(query, temp, &r300->query_list) {
remove_from_list(query);
FREE(query);
}
r300->context.delete_depth_stencil_alpha_state(&r300->context,
r300->dsa_decompress_zmask);
}
@ -408,8 +401,6 @@ struct pipe_context* r300_create_context(struct pipe_screen* screen,
r300->context.destroy = r300_destroy_context;
make_empty_list(&r300->query_list);
util_slab_create(&r300->pool_transfers,
sizeof(struct pipe_transfer), 64,
UTIL_SLAB_SINGLETHREADED);

6
src/gallium/drivers/r300/r300_context.h
View file

@ -293,12 +293,6 @@ struct r300_query {
/* The buffer where query results are stored. */
struct pb_buffer *buf;
struct radeon_winsys_cs_handle *cs_buf;
/* The size of the buffer. */
unsigned buffer_size;
/* Linked list members. */
struct r300_query* prev;
struct r300_query* next;
};
struct r300_surface {

4
src/gallium/drivers/r300/r300_emit.c
View file

@ -675,8 +675,8 @@ void r300_emit_query_end(struct r300_context* r300)
query->num_results += query->num_pipes;
/* XXX grab all the results and reset the counter. */
if (query->num_results >= query->buffer_size / 4 - 4) {
query->num_results = (query->buffer_size / 4) / 2;
if (query->num_results >= query->buf->size / 4 - 4) {
query->num_results = (query->buf->size / 4) / 2;
fprintf(stderr, "r300: Rewinding OQBO...\n");
}
}

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

@ -45,17 +45,14 @@ static struct pipe_query *r300_create_query(struct pipe_context *pipe,
return NULL;
q->type = query_type;
q->buffer_size = 4096;
if (r300screen->caps.family == CHIP_FAMILY_RV530)
q->num_pipes = r300screen->info.r300_num_z_pipes;
else
q->num_pipes = r300screen->info.r300_num_gb_pipes;
insert_at_tail(&r300->query_list, q);
/* Open up the occlusion query buffer. */
q->buf = r300->rws->buffer_create(r300->rws, q->buffer_size, 4096,
q->buf = r300->rws->buffer_create(r300->rws, 4096, 4096,
PIPE_BIND_CUSTOM, PIPE_USAGE_STAGING);
q->cs_buf = r300->rws->buffer_get_cs_handle(q->buf);
@ -68,7 +65,6 @@ static void r300_destroy_query(struct pipe_context* pipe,
struct r300_query* q = r300_query(query);
pb_reference(&q->buf, NULL);
remove_from_list(q);
FREE(query);
}