KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i965: Stop using the kernel SOL reset feature. 

We can just do it ourselves with MI_LOAD_REGISTER_IMM.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
This commit is contained in:
Kenneth Graunke 2013-05-17 10:55:35 -07:00
parent 6837ebd00f
commit eaa6fbe6d5
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/mesa/drivers/dri/i965/gen6_sol.c
View File

@ -184,11 +184,14 @@ brw_begin_transform_feedback(struct gl_context *ctx, GLenum mode,
brw->sol.offset_0_batch_start = 0;
if (intel->gen >= 7) {
/* Ask the kernel to reset the SO offsets for any previous transform
* feedback, so we start at the start of the user's buffer. (note: these
* are not the query counters)
*/
intel->batch.needs_sol_reset = true;
/* Reset the SOL buffer offset register. */
for (int i = 0; i < 4; i++) {
BEGIN_BATCH(3);
OUT_BATCH(MI_LOAD_REGISTER_IMM | (3 - 2));
OUT_BATCH(GEN7_SO_WRITE_OFFSET(i));
OUT_BATCH(0);
ADVANCE_BATCH();
}
}
}

4
src/mesa/drivers/dri/intel/intel_batchbuffer.c
View File

@ -96,7 +96,6 @@ intel_batchbuffer_reset(struct intel_context *intel)
intel->batch.reserved_space = BATCH_RESERVED;
intel->batch.state_batch_offset = intel->batch.bo->size;
intel->batch.used = 0;
intel->batch.needs_sol_reset = false;
}
void
@ -199,9 +198,6 @@ do_flush_locked(struct intel_context *intel)
flags = I915_EXEC_BLT;
}
if (batch->needs_sol_reset)
flags |= I915_EXEC_GEN7_SOL_RESET;
if (ret == 0) {
if (unlikely(INTEL_DEBUG & DEBUG_AUB) && intel->vtbl.annotate_aub)
intel->vtbl.annotate_aub(intel);

1
src/mesa/drivers/dri/intel/intel_context.h
View File

@ -135,7 +135,6 @@ struct intel_batchbuffer {
uint32_t state_batch_offset;
bool is_blit;
bool needs_sol_reset;
struct {
uint16_t used;