projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mesa_7_7_branch'
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
i965
/
brw_queryobj.c
diff --git
a/src/mesa/drivers/dri/i965/brw_queryobj.c
b/src/mesa/drivers/dri/i965/brw_queryobj.c
index cb9169e2eef1846088a0ee515e9da37e04920369..5399a742449a7ca9bf6f97a00082457c9d27c753 100644
(file)
--- a/
src/mesa/drivers/dri/i965/brw_queryobj.c
+++ b/
src/mesa/drivers/dri/i965/brw_queryobj.c
@@
-146,17
+146,12
@@
static void brw_wait_query(GLcontext *ctx, struct gl_query_object *q)
static void brw_check_query(GLcontext *ctx, struct gl_query_object *q)
{
static void brw_check_query(GLcontext *ctx, struct gl_query_object *q)
{
- /* XXX: Need to expose dri_bo_is_idle from bufmgr. */
-#if 0
struct brw_query_object *query = (struct brw_query_object *)q;
struct brw_query_object *query = (struct brw_query_object *)q;
- if (
dri_bo_is_idle
(query->bo)) {
+ if (
query->bo == NULL || !drm_intel_bo_busy
(query->bo)) {
brw_queryobj_get_results(query);
query->Base.Ready = GL_TRUE;
}
brw_queryobj_get_results(query);
query->Base.Ready = GL_TRUE;
}
-#else
- brw_wait_query(ctx, q);
-#endif
}
/** Called to set up the query BO and account for its aperture space */
}
/** Called to set up the query BO and account for its aperture space */
@@
-193,7
+188,7
@@
brw_emit_query_begin(struct brw_context *brw)
if (brw->query.active || is_empty_list(&brw->query.active_head))
return;
if (brw->query.active || is_empty_list(&brw->query.active_head))
return;
- BEGIN_BATCH(4
, IGNORE_CLIPRECTS
);
+ BEGIN_BATCH(4);
OUT_BATCH(_3DSTATE_PIPE_CONTROL |
PIPE_CONTROL_DEPTH_STALL |
PIPE_CONTROL_WRITE_DEPTH_COUNT);
OUT_BATCH(_3DSTATE_PIPE_CONTROL |
PIPE_CONTROL_DEPTH_STALL |
PIPE_CONTROL_WRITE_DEPTH_COUNT);
@@
-232,7
+227,7
@@
brw_emit_query_end(struct brw_context *brw)
if (!brw->query.active)
return;
if (!brw->query.active)
return;
- BEGIN_BATCH(4
, IGNORE_CLIPRECTS
);
+ BEGIN_BATCH(4);
OUT_BATCH(_3DSTATE_PIPE_CONTROL |
PIPE_CONTROL_DEPTH_STALL |
PIPE_CONTROL_WRITE_DEPTH_COUNT);
OUT_BATCH(_3DSTATE_PIPE_CONTROL |
PIPE_CONTROL_DEPTH_STALL |
PIPE_CONTROL_WRITE_DEPTH_COUNT);