KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gallium/radeon: move r600_common_context::texture_buffers to r600g 

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
This commit is contained in:
Marek Olšák 2016-10-02 16:12:47 +02:00
parent 7ce19d9014
commit 6c01684393
6 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/r600/evergreen_state.c
View File

@ -648,7 +648,7 @@ texture_buffer_sampler_view(struct r600_context *rctx,
view->tex_resource_words[7] = S_03001C_TYPE(V_03001C_SQ_TEX_VTX_VALID_BUFFER);
if (tmp->resource.gpu_address)
LIST_ADDTAIL(&view->list, &rctx->b.texture_buffers);
LIST_ADDTAIL(&view->list, &rctx->texture_buffers);
return &view->base;
}

1
src/gallium/drivers/r600/r600_pipe.c
View File

@ -133,6 +133,7 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen,
goto fail;
rctx->screen = rscreen;
LIST_INITHEAD(&rctx->texture_buffers);
r600_init_blit_functions(rctx);

5
src/gallium/drivers/r600/r600_pipe.h
View File

@ -501,6 +501,11 @@ struct r600_context {
unsigned zwritemask;
int ps_iter_samples;
/* The list of all texture buffer objects in this context.
* This list is walked when a buffer is invalidated/reallocated and
* the GPU addresses are updated. */
struct list_head texture_buffers;
/* Index buffer. */
struct pipe_index_buffer index_buffer;

2
src/gallium/drivers/r600/r600_state_common.c
View File

@ -2829,7 +2829,7 @@ static void r600_invalidate_buffer(struct pipe_context *ctx, struct pipe_resourc
}
/* Texture buffer objects - update the virtual addresses in descriptors. */
LIST_FOR_EACH_ENTRY(view, &rctx->b.texture_buffers, list) {
LIST_FOR_EACH_ENTRY(view, &rctx->texture_buffers, list) {
if (view->base.texture == &rbuffer->b.b) {
uint64_t offset = view->base.u.buf.offset;
uint64_t va = rbuffer->gpu_address + offset;

2
src/gallium/drivers/radeon/r600_pipe_common.c
View File

@ -528,8 +528,6 @@ bool r600_common_context_init(struct r600_common_context *rctx,
RADEON_GPU_RESET_COUNTER);
}
LIST_INITHEAD(&rctx->texture_buffers);
r600_init_context_texture_functions(rctx);
r600_init_viewport_functions(rctx);
r600_streamout_init(rctx);

5
src/gallium/drivers/radeon/r600_pipe_common.h
View File

@ -615,11 +615,6 @@ struct r600_common_context {
bool query_active;
} dcc_stats[5];
/* The list of all texture buffer objects in this context.
* This list is walked when a buffer is invalidated/reallocated and
* the GPU addresses are updated. */
struct list_head texture_buffers;
struct pipe_debug_callback debug;
void *query_result_shader;