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

gallium/radeon: don't re-create queries for DCC stat gathering 

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Marek Olšák 2016-06-27 19:46:39 +02:00
parent 82b39f3521
commit 44906101c4
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/drivers/radeon/r600_query.c
View File

@ -728,8 +728,8 @@ static boolean r600_begin_query(struct pipe_context *ctx,
return rquery->ops->begin(rctx, rquery); return rquery->ops->begin(rctx, rquery);
} }
static void r600_query_hw_reset_buffers(struct r600_common_context *rctx, void r600_query_hw_reset_buffers(struct r600_common_context *rctx,
struct r600_query_hw *query) struct r600_query_hw *query)
{ {
struct r600_query_buffer *prev = query->buffer.previous; struct r600_query_buffer *prev = query->buffer.previous;

2
src/gallium/drivers/radeon/r600_query.h
View File

@ -258,5 +258,7 @@ void r600_perfcounters_add_block(struct r600_common_screen *,
unsigned counters, unsigned selectors, unsigned counters, unsigned selectors,
unsigned instances, void *data); unsigned instances, void *data);
void r600_perfcounters_do_destroy(struct r600_perfcounters *); void r600_perfcounters_do_destroy(struct r600_perfcounters *);
void r600_query_hw_reset_buffers(struct r600_common_context *rctx,
struct r600_query_hw *query);
#endif /* R600_QUERY_H */ #endif /* R600_QUERY_H */

9
src/gallium/drivers/radeon/r600_texture.c
View File

@ -1884,6 +1884,7 @@ void vi_separate_dcc_process_and_reset_stats(struct pipe_context *ctx,
struct r600_texture *tex) struct r600_texture *tex)
{ {
struct r600_common_context *rctx = (struct r600_common_context*)ctx; struct r600_common_context *rctx = (struct r600_common_context*)ctx;
struct pipe_query *tmp;
unsigned i = vi_get_context_dcc_stats_index(rctx, tex); unsigned i = vi_get_context_dcc_stats_index(rctx, tex);
bool query_active = rctx->dcc_stats[i].query_active; bool query_active = rctx->dcc_stats[i].query_active;
bool disable = false; bool disable = false;
@ -1894,8 +1895,9 @@ void vi_separate_dcc_process_and_reset_stats(struct pipe_context *ctx,
/* Read the results. */ /* Read the results. */
ctx->get_query_result(ctx, rctx->dcc_stats[i].ps_stats[2], ctx->get_query_result(ctx, rctx->dcc_stats[i].ps_stats[2],
true, &result); true, &result);
ctx->destroy_query(ctx, rctx->dcc_stats[i].ps_stats[2]); r600_query_hw_reset_buffers(rctx,
rctx->dcc_stats[i].ps_stats[2] = NULL; (struct r600_query_hw*)
rctx->dcc_stats[i].ps_stats[2]);
/* Compute the approximate number of fullscreen draws. */ /* Compute the approximate number of fullscreen draws. */
tex->ps_draw_ratio = tex->ps_draw_ratio =
@ -1914,9 +1916,10 @@ void vi_separate_dcc_process_and_reset_stats(struct pipe_context *ctx,
vi_separate_dcc_stop_query(ctx, tex); vi_separate_dcc_stop_query(ctx, tex);
/* Move the queries in the queue by one. */ /* Move the queries in the queue by one. */
tmp = rctx->dcc_stats[i].ps_stats[2];
rctx->dcc_stats[i].ps_stats[2] = rctx->dcc_stats[i].ps_stats[1]; rctx->dcc_stats[i].ps_stats[2] = rctx->dcc_stats[i].ps_stats[1];
rctx->dcc_stats[i].ps_stats[1] = rctx->dcc_stats[i].ps_stats[0]; rctx->dcc_stats[i].ps_stats[1] = rctx->dcc_stats[i].ps_stats[0];
rctx->dcc_stats[i].ps_stats[0] = NULL; rctx->dcc_stats[i].ps_stats[0] = tmp;
/* create and start a new query as ps_stats[0] */ /* create and start a new query as ps_stats[0] */
if (query_active) if (query_active)