Revert "i965: Move brw_emit_query_begin() to the render ring prelude."
authorKenneth Graunke <kenneth@whitecape.org>
Wed, 27 Nov 2013 00:32:14 +0000 (16:32 -0800)
committerKenneth Graunke <kenneth@whitecape.org>
Wed, 4 Dec 2013 00:24:53 +0000 (16:24 -0800)
commite03994bf47f9741a7a3a6181eb4f4d0cf286f70f
tree8b26e34c2c69f587d42fcb30cf540ca10cd4f038
parentda07e1b6837616ef101d1374dbff322694d6a7d9
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 <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
src/mesa/drivers/dri/i965/brw_draw_upload.c
src/mesa/drivers/dri/i965/intel_batchbuffer.c