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

r600g: Remove vs_resource and ps_resource from the pipe context.

Browse source 
These are practically unused, only the vs_resource array is being abused for
fetch shader resources.
This commit is contained in:
Henri Verbeet 2011-02-07 15:22:07 +01:00
parent 7687eabaa0
commit b9fd1a1e4b
3 changed files with 6 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/gallium/drivers/r600/r600_pipe.c
View file

@ -88,8 +88,6 @@ static void r600_destroy_context(struct pipe_context *context)
u_upload_destroy(rctx->upload_const);
u_vbuf_mgr_destroy(rctx->vbuf_mgr);
FREE(rctx->ps_resource);
FREE(rctx->vs_resource);
FREE(rctx);
}
@ -187,18 +185,6 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
return NULL;
}
rctx->vs_resource = CALLOC(R600_RESOURCE_ARRAY_SIZE, sizeof(struct r600_pipe_state));
if (!rctx->vs_resource) {
FREE(rctx);
return NULL;
}
rctx->ps_resource = CALLOC(R600_RESOURCE_ARRAY_SIZE, sizeof(struct r600_pipe_state));
if (!rctx->ps_resource) {
FREE(rctx);
return NULL;
}
class = r600_get_family_class(rctx->radeon);
if (class == R600 || class == R700)
rctx->custom_dsa_flush = r600_create_db_flush_dsa(rctx);

4
src/gallium/drivers/r600/r600_pipe.h
View file

@ -128,6 +128,7 @@ struct r600_pipe_context {
struct r600_pipe_state *states[R600_PIPE_NSTATES];
struct r600_context ctx;
struct r600_vertex_element *vertex_elements;
struct r600_pipe_state fs_resource[PIPE_MAX_ATTRIBS];
struct pipe_framebuffer_state framebuffer;
struct pipe_index_buffer index_buffer;
unsigned cb_target_mask;
@ -135,9 +136,6 @@ struct r600_pipe_context {
struct pipe_stencil_ref stencil_ref;
struct pipe_viewport_state viewport;
struct pipe_clip_state clip;
unsigned nvs_resource;
struct r600_pipe_state *vs_resource;
struct r600_pipe_state *ps_resource;
struct r600_pipe_state config;
struct r600_pipe_shader *ps_shader;
struct r600_pipe_shader *vs_shader;

10
src/gallium/drivers/r600/r600_state_common.c
View file

@ -365,18 +365,18 @@ static void r600_vertex_buffer_update(struct r600_pipe_context *rctx)
struct r600_pipe_state *rstate;
struct r600_resource *rbuffer;
struct pipe_vertex_buffer *vertex_buffer;
unsigned i, offset;
unsigned i, count, offset;
if (rctx->vertex_elements->vbuffer_need_offset) {
/* one resource per vertex elements */
rctx->nvs_resource = rctx->vertex_elements->count;
count = rctx->vertex_elements->count;
} else {
/* bind vertex buffer once */
rctx->nvs_resource = rctx->vbuf_mgr->nr_real_vertex_buffers;
count = rctx->vbuf_mgr->nr_real_vertex_buffers;
}
for (i = 0 ; i < rctx->nvs_resource; i++) {
rstate = &rctx->vs_resource[i];
for (i = 0 ; i < count; i++) {
rstate = &rctx->fs_resource[i];
rstate->id = R600_PIPE_STATE_RESOURCE;
rstate->nregs = 0;