gallium/radeon: print more information about textures

[mesa.git] / src / gallium / drivers / radeon / r600_pipe_common.c

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c
index 9cb30c753cc1394ceab50c55b5dd6d5ce4f0721b..27e1269f40021383a5176fd83e2db67f63074405 100644 (file)
--- a/src/gallium/drivers/radeon/r600_pipe_common.c
+++ b/src/gallium/drivers/radeon/r600_pipe_common.c
@@ -27,6 +27,7 @@
 #include "r600_pipe_common.h"
 #include "r600_cs.h"
 #include "tgsi/tgsi_parse.h"
+#include "util/list.h"
 #include "util/u_draw_quad.h"
 #include "util/u_memory.h"
 #include "util/u_format_s3tc.h"
@@ -135,12 +136,14 @@ static void r600_memory_barrier(struct pipe_context *ctx, unsigned flags)
 void r600_preflush_suspend_features(struct r600_common_context *ctx)
 {
        /* suspend queries */
-       ctx->queries_suspended_for_flush = false;
        if (ctx->num_cs_dw_nontimer_queries_suspend) {
+               /* Since non-timer queries are suspended during blits,
+                * we have to guard against double-suspends. */
                r600_suspend_nontimer_queries(ctx);
-               r600_suspend_timer_queries(ctx);
-               ctx->queries_suspended_for_flush = true;
+               ctx->nontimer_queries_suspended_by_flush = true;
        }
+       if (!LIST_IS_EMPTY(&ctx->active_timer_queries))
+               r600_suspend_timer_queries(ctx);
 
        ctx->streamout.suspended = false;
        if (ctx->streamout.begin_emitted) {
@@ -157,9 +160,11 @@ void r600_postflush_resume_features(struct r600_common_context *ctx)
        }
 
        /* resume queries */
-       if (ctx->queries_suspended_for_flush) {
-               r600_resume_nontimer_queries(ctx);
+       if (!LIST_IS_EMPTY(&ctx->active_timer_queries))
                r600_resume_timer_queries(ctx);
+       if (ctx->nontimer_queries_suspended_by_flush) {
+               ctx->nontimer_queries_suspended_by_flush = false;
+               r600_resume_nontimer_queries(ctx);
        }
 }
 
@@ -339,7 +344,6 @@ void r600_context_add_resource_size(struct pipe_context *ctx, struct pipe_resour
 static const struct debug_named_value common_debug_options[] = {
        /* logging */
        { "tex", DBG_TEX, "Print texture info" },
-       { "texmip", DBG_TEXMIP, "Print texture info (mipmapped only)" },
        { "compute", DBG_COMPUTE, "Print compute info" },
        { "vm", DBG_VM, "Print virtual addresses when creating resources" },
        { "trace_cs", DBG_TRACE_CS, "Trace cs and write rlockup_<csid>.c file with faulty cs" },
@@ -978,6 +982,7 @@ bool r600_common_screen_init(struct r600_common_screen *rscreen,
 
 void r600_destroy_common_screen(struct r600_common_screen *rscreen)
 {
+       r600_perfcounters_destroy(rscreen);
        r600_gpu_load_kill_thread(rscreen);
 
        pipe_mutex_destroy(rscreen->gpu_load_mutex);