diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2013-07-03 14:21:19 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2013-07-09 14:09:08 -0700 |
| commit | 329779a0b45b63be17627f026533c80b2c8f7991 (patch) | |
| tree | 88ee98c79bdfdacaf50b53d7303caf2f1d63688b /src/mesa/drivers/dri/i965/gen6_queryobj.c | |
| parent | 5d8186ac1a22afbaa6ed68e0fb67d1f150f798cb (diff) | |
| download | external_mesa3d-329779a0b45b63be17627f026533c80b2c8f7991.zip external_mesa3d-329779a0b45b63be17627f026533c80b2c8f7991.tar.gz external_mesa3d-329779a0b45b63be17627f026533c80b2c8f7991.tar.bz2 | |
i965: Move intel_context::batch to brw_context.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Chris Forbes <chrisf@ijw.co.nz>
Acked-by: Paul Berry <stereotype441@gmail.com>
Acked-by: Anuj Phogat <anuj.phogat@gmail.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/gen6_queryobj.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen6_queryobj.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/gen6_queryobj.c b/src/mesa/drivers/dri/i965/gen6_queryobj.c index 8a051b7..a3af19e 100644 --- a/src/mesa/drivers/dri/i965/gen6_queryobj.c +++ b/src/mesa/drivers/dri/i965/gen6_queryobj.c @@ -166,7 +166,7 @@ gen6_queryobj_get_results(struct gl_context *ctx, * still contributing to it, flush it now so the results will be present * when mapped. */ - if (drm_intel_bo_references(intel->batch.bo, query->bo)) + if (drm_intel_bo_references(brw->batch.bo, query->bo)) intel_batchbuffer_flush(brw); if (unlikely(intel->perf_debug)) { @@ -361,7 +361,6 @@ static void gen6_wait_query(struct gl_context *ctx, struct gl_query_object *q) static void gen6_check_query(struct gl_context *ctx, struct gl_query_object *q) { struct brw_context *brw = brw_context(ctx); - struct intel_context *intel = intel_context(ctx); struct brw_query_object *query = (struct brw_query_object *)q; /* From the GL_ARB_occlusion_query spec: @@ -371,7 +370,7 @@ static void gen6_check_query(struct gl_context *ctx, struct gl_query_object *q) * not ready yet on the first time it is queried. This ensures that * the async query will return true in finite time. */ - if (query->bo && drm_intel_bo_references(intel->batch.bo, query->bo)) + if (query->bo && drm_intel_bo_references(brw->batch.bo, query->bo)) intel_batchbuffer_flush(brw); if (query->bo == NULL || !drm_intel_bo_busy(query->bo)) { |