diff options
| author | Keith Whitwell <keithw@vmware.com> | 2010-03-13 15:06:35 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2010-03-13 15:06:35 +0000 |
| commit | 47bfbd452c93e6a8db013fb90d9f42210cf24889 (patch) | |
| tree | e3cebba97261f567f461769d891aa77707b57bd7 /src/gallium/drivers/r300/r300_render.c | |
| parent | faa14818856e1e9a4ee624c2bc04d7aecabd07ab (diff) | |
| parent | a80e33f40731f07e8a39896bfdcd1b1504aedc1f (diff) | |
Merge commit 'origin/master' into gallium-sampler-view
Conflicts:
src/gallium/auxiliary/util/u_tile.c
src/gallium/auxiliary/util/u_tile.h
src/gallium/drivers/identity/id_context.c
src/gallium/drivers/llvmpipe/lp_setup.c
src/gallium/drivers/llvmpipe/lp_setup.h
src/gallium/drivers/softpipe/sp_tex_tile_cache.c
src/gallium/include/pipe/p_context.h
src/mesa/state_tracker/st_cb_bitmap.c
src/mesa/state_tracker/st_cb_drawpixels.c
Diffstat (limited to 'src/gallium/drivers/r300/r300_render.c')
| -rw-r--r-- | src/gallium/drivers/r300/r300_render.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/r300/r300_render.c b/src/gallium/drivers/r300/r300_render.c index 9c001ae186..ccf39876a5 100644 --- a/src/gallium/drivers/r300/r300_render.c +++ b/src/gallium/drivers/r300/r300_render.c @@ -274,14 +274,14 @@ static void r300_emit_draw_elements(struct r300_context *r300, #endif CS_LOCALS(r300); - assert((start * indexSize) % 4 == 0); + assert((start * indexSize) % 4 == 0); assert(count < (1 << 24)); + maxIndex = MIN3(maxIndex, r300->vertex_buffer_max_index, count - minIndex); + DBG(r300, DBG_DRAW, "r300: Indexbuf of %u indices, min %u max %u\n", count, minIndex, maxIndex); - maxIndex = MIN2(maxIndex, r300->vertex_buffer_max_index); - if (alt_num_verts) { BEGIN_CS(15); OUT_CS_REG(R500_VAP_ALT_NUM_VERTICES, count); |