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

ilo: sanity check ilo_render_get_*_len()

Browse source 
Assert that we never write more than what ilo_render_get_*_len() returns.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
This commit is contained in:
Chia-I Wu 2014-09-25 12:44:53 +08:00
parent 7fc7415316
commit f1662e3670
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/gallium/drivers/ilo/ilo_render.c
View file

@ -215,6 +215,7 @@ ilo_render_emit_flush(struct ilo_render *render)
GEN6_PIPE_CONTROL_VF_CACHE_INVALIDATE | GEN6_PIPE_CONTROL_VF_CACHE_INVALIDATE |
GEN6_PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE | GEN6_PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE |
GEN6_PIPE_CONTROL_CS_STALL; GEN6_PIPE_CONTROL_CS_STALL;
const unsigned batch_used = ilo_builder_batch_used(render->builder);
ILO_DEV_ASSERT(render->dev, 6, 7.5); ILO_DEV_ASSERT(render->dev, 6, 7.5);
@ -225,6 +226,9 @@ ilo_render_emit_flush(struct ilo_render *render)
render->state.current_pipe_control_dw1 |= dw1; render->state.current_pipe_control_dw1 |= dw1;
render->state.deferred_pipe_control_dw1 &= ~dw1; render->state.deferred_pipe_control_dw1 &= ~dw1;
assert(ilo_builder_batch_used(render->builder) <= batch_used +
ilo_render_get_flush_len(render));
} }
/** /**
@ -300,6 +304,7 @@ ilo_render_emit_query(struct ilo_render *render,
(ilo_dev_gen(render->dev) >= ILO_GEN(7)) ? (ilo_dev_gen(render->dev) >= ILO_GEN(7)) ?
GEN7_REG_SO_NUM_PRIMS_WRITTEN(q->index) : GEN7_REG_SO_NUM_PRIMS_WRITTEN(q->index) :
GEN6_REG_SO_NUM_PRIMS_WRITTEN; GEN6_REG_SO_NUM_PRIMS_WRITTEN;
const unsigned batch_used = ilo_builder_batch_used(render->builder);
const uint32_t *regs; const uint32_t *regs;
int reg_count = 0, i; int reg_count = 0, i;
uint32_t pipe_control_dw1 = 0; uint32_t pipe_control_dw1 = 0;
@ -332,6 +337,8 @@ ilo_render_emit_query(struct ilo_render *render,
} }
if (pipe_control_dw1) { if (pipe_control_dw1) {
assert(!reg_count);
if (ilo_dev_gen(render->dev) == ILO_GEN(6)) if (ilo_dev_gen(render->dev) == ILO_GEN(6))
gen6_wa_pre_pipe_control(render, pipe_control_dw1); gen6_wa_pre_pipe_control(render, pipe_control_dw1);
@ -340,13 +347,10 @@ ilo_render_emit_query(struct ilo_render *render,
render->state.current_pipe_control_dw1 |= pipe_control_dw1; render->state.current_pipe_control_dw1 |= pipe_control_dw1;
render->state.deferred_pipe_control_dw1 &= ~pipe_control_dw1; render->state.deferred_pipe_control_dw1 &= ~pipe_control_dw1;
} else if (reg_count) {
ilo_render_emit_flush(render);
} }
if (!reg_count)
return;
ilo_render_emit_flush(render);
for (i = 0; i < reg_count; i++) { for (i = 0; i < reg_count; i++) {
if (regs[i]) { if (regs[i]) {
/* store lower 32 bits */ /* store lower 32 bits */
@ -360,4 +364,7 @@ ilo_render_emit_query(struct ilo_render *render,
offset += 8; offset += 8;
} }
assert(ilo_builder_batch_used(render->builder) <= batch_used +
ilo_render_get_query_len(render, q->type));
} }