summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Froehlich <Mathias.Froehlich@gmx.net>2015-04-12 18:23:58 +0200
committerMathias Froehlich <Mathias.Froehlich@gmx.net>2015-04-13 20:30:23 +0200
commit1e1d5456ba3dff82301ad4bbdde2fb6e2f562fe3 (patch)
treeaba60a6568aa206bc863ee00ebd94e88389ed881
parentadae027260bedc7af73e5cc7a74af3cafa4ab460 (diff)
downloadexternal_mesa3d-1e1d5456ba3dff82301ad4bbdde2fb6e2f562fe3.zip
external_mesa3d-1e1d5456ba3dff82301ad4bbdde2fb6e2f562fe3.tar.gz
external_mesa3d-1e1d5456ba3dff82301ad4bbdde2fb6e2f562fe3.tar.bz2
i965: Flush batchbuffer containing the query on glQueryCounter.
This change fixes a regression with timer queries introduced with commit 3eb6258. There the pending batchbuffer is flushed only if glEndQuery is executed. This present change adds such a flush to glQueryCounter which also schedules a value query just like glEndQuery does. The patch fixes GPU timer queries going mad from within osgviewer. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Signed-off-by: Mathias Froehlich <Mathias.Froehlich@web.de> Cc: mesa-stable@lists.freedesktop.org
-rw-r--r--src/mesa/drivers/dri/i965/brw_queryobj.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_queryobj.c b/src/mesa/drivers/dri/i965/brw_queryobj.c
index 917a24f..667c900 100644
--- a/src/mesa/drivers/dri/i965/brw_queryobj.c
+++ b/src/mesa/drivers/dri/i965/brw_queryobj.c
@@ -472,6 +472,8 @@ brw_query_counter(struct gl_context *ctx, struct gl_query_object *q)
drm_intel_bo_unreference(query->bo);
query->bo = drm_intel_bo_alloc(brw->bufmgr, "timestamp query", 4096, 4096);
brw_write_timestamp(brw, query->bo, 0);
+
+ query->flushed = false;
}
/**