diff options
| author | Pauli Nieminen <[email protected]> | 2009-08-24 00:57:05 +0300 |
|---|---|---|
| committer | Pauli Nieminen <[email protected]> | 2009-08-24 00:57:05 +0300 |
| commit | 7bb0f880dbdee0c57693c3a1f331d7c0894e71e1 (patch) | |
| tree | c46a42d33501c1a9d56596981f50ce98746aa040 /src/mesa/drivers/dri/r300/r300_render.c | |
| parent | effda2e2a7f8ef7406d698c6b31dbbff408ed112 (diff) | |
| parent | 4484ce9c7b196a686a3928f7e29dc8d9b6f3cae3 (diff) | |
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into r600_state_predict
Conflicts:
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/radeon/radeon_cmdbuf.h
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_render.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_render.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c index f3674f9c7b8..446cf40131e 100644 --- a/src/mesa/drivers/dri/r300/r300_render.c +++ b/src/mesa/drivers/dri/r300/r300_render.c @@ -390,7 +390,7 @@ void r300RunRenderPrimitive(GLcontext * ctx, int start, int end, int prim) GLuint first, incr, offset = 0; if (!split_prim_inplace(prim & PRIM_MODE_MASK, &first, &incr) && - num_verts > 65500) { + num_verts > 65535) { WARN_ONCE("Fixme: can't handle spliting prim %d\n", prim); return; } |