diff options
| author | Kenneth Graunke <[email protected]> | 2013-11-26 16:32:14 -0800 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2013-12-03 16:24:53 -0800 |
| commit | e03994bf47f9741a7a3a6181eb4f4d0cf286f70f (patch) | |
| tree | 8b26e34c2c69f587d42fcb30cf540ca10cd4f038 | |
| parent | da07e1b6837616ef101d1374dbff322694d6a7d9 (diff) | |
Revert "i965: Move brw_emit_query_begin() to the render ring prelude."
This reverts commit a4bf7f6b6e612626c4e4fc21507ac213a7ba4b00.
It breaks occlusion queries on Gen4-5. Doing this right will likely
require larger changes, which should be done at a future date.
Some Piglit tests still passed due to other bugs; fixing those revealed
this problem.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_draw_upload.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_batchbuffer.c | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c b/src/mesa/drivers/dri/i965/brw_draw_upload.c index 89404b09e61..57b81df8110 100644 --- a/src/mesa/drivers/dri/i965/brw_draw_upload.c +++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c @@ -614,6 +614,8 @@ static void brw_emit_vertices(struct brw_context *brw) brw_prepare_vertices(brw); + brw_emit_query_begin(brw); + nr_elements = brw->vb.nr_enabled + brw->vs.prog_data->uses_vertexid; /* If the VS doesn't read any inputs (calculating vertex position from diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.c b/src/mesa/drivers/dri/i965/intel_batchbuffer.c index 25aacd95b9d..6b25c0261dc 100644 --- a/src/mesa/drivers/dri/i965/intel_batchbuffer.c +++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.c @@ -182,13 +182,7 @@ do_batch_dump(struct brw_context *brw) void intel_batchbuffer_emit_render_ring_prelude(struct brw_context *brw) { - /* Without hardware contexts, we need to capture the pipeline statistics - * registers at the start and end of each render ring batch, so we can see - * what that batch contributed. Emit state packets to write them to a BO. - */ - brw_emit_query_begin(brw); - - /* We may also need to enable and snapshot OA counters. */ + /* We may need to enable and snapshot OA counters. */ brw_perf_monitor_new_batch(brw); } |