Module: Mesa
Branch: master
Commit: cb5cfb8361338c4a9e413f287591c1678187bcfc
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=cb5cfb8361338c4a9e413f287591c1678187bcfc
Author: Kenneth Graunke <kenn...@whitecape.org>
Date: Thu Dec 11 01:57:39 2014 -0800
i965/query: Use brw_bo_map to handle stall warnings.
This is less code and also measures the duration of the stall for us.
Our old code predates the existance of brw_bo_map().
Signed-off-by: Kenneth Graunke <kenn...@whitecape.org>
Reviewed-by: Ben Widawsky <b...@bwidawsk.net>
Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>
---
src/mesa/drivers/dri/i965/gen6_queryobj.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/gen6_queryobj.c
b/src/mesa/drivers/dri/i965/gen6_queryobj.c
index 9d2e5c4..0d51390 100644
--- a/src/mesa/drivers/dri/i965/gen6_queryobj.c
+++ b/src/mesa/drivers/dri/i965/gen6_queryobj.c
@@ -121,13 +121,7 @@ gen6_queryobj_get_results(struct gl_context *ctx,
if (query->bo == NULL)
return;
- if (unlikely(brw->perf_debug)) {
- if (drm_intel_bo_busy(query->bo)) {
- perf_debug("Stalling on the GPU waiting for a query object.\n");
- }
- }
-
- drm_intel_bo_map(query->bo, false);
+ brw_bo_map(brw, query->bo, false, "query object");
uint64_t *results = query->bo->virtual;
switch (query->Base.Target) {
case GL_TIME_ELAPSED:
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
