diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-02-23 12:04:09 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-02-23 12:04:09 +0000 |
| commit | a647aff5124674b638ef52152a5c16c27466eed7 (patch) | |
| tree | 939019b98b19d7a259709f9aa2766908a95f4b32 | |
| parent | cd3a618f583a546bafbe0c171a267774adc4d72b (diff) | |
sna/gen3: Silence the compiler complaining with DBG enabled
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/gen3_render.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c index 6828a160..b50d0671 100644 --- a/src/sna/gen3_render.c +++ b/src/sna/gen3_render.c @@ -1732,7 +1732,7 @@ inline static int gen3_get_rectangles(struct sna *sna, int rem; DBG(("%s: want=%d, rem=%d\n", - __FUNCTION__, want*op->floats_per_rect, rem)); + __FUNCTION__, want*op->floats_per_rect, vertex_space(sna))); assert(sna->render.vertex_index * op->floats_per_vertex == sna->render.vertex_used); @@ -1742,12 +1742,12 @@ start: DBG(("flushing vbo for %s: %d < %d\n", __FUNCTION__, rem, op->floats_per_rect)); rem = gen3_get_rectangles__flush(sna, op); - if (rem == 0) + if (unlikely(rem == 0)) goto flush; } - if (sna->render_state.gen3.vertex_offset == 0 && - !gen3_rectangle_begin(sna, op)) + if (unlikely(sna->render_state.gen3.vertex_offset == 0 && + !gen3_rectangle_begin(sna, op))) goto flush; if (want > 1 && want * op->floats_per_rect > rem) |