fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 17:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert "i965: Move brw_emit_query_begin() to the render ring prelude."

Browse source 
This reverts commit a4bf7f6b6e.
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 <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Kenneth Graunke 2013-11-26 16:32:14 -08:00
parent da07e1b683
commit e03994bf47
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/i965/brw_draw_upload.c
View file

@ -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

8
src/mesa/drivers/dri/i965/intel_batchbuffer.c
View file

@ -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);
}