diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2008-09-23 17:08:24 -0700 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2008-09-23 17:23:14 -0700 |
| commit | 2cb3d2b7a0d8f505131e98053d3e19982012fccd (patch) | |
| tree | da9a95967c877f4b71c40dcdea681480f2e75cf2 /src/mesa/drivers/dri/i965/brw_curbe.c | |
| parent | 9e7c0724bbc62c86dc302a9fe76b3e4288fc4461 (diff) | |
| parent | ec76910187adc88fc54907ffa3506309ee2abcf3 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
src/mesa/glapi/glapi_getproc.c
src/mesa/main/image.c
src/mesa/shader/slang/slang_link.c
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_curbe.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_curbe.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_curbe.c b/src/mesa/drivers/dri/i965/brw_curbe.c index c4e06af6b1..7cddd3a7de 100644 --- a/src/mesa/drivers/dri/i965/brw_curbe.c +++ b/src/mesa/drivers/dri/i965/brw_curbe.c @@ -282,7 +282,8 @@ static void prepare_constant_buffer(struct brw_context *brw) brw->curbe.last_bufsz = bufsz; if (brw->curbe.curbe_bo != NULL && - brw->curbe.curbe_next_offset + bufsz > brw->curbe.curbe_bo->size) + (brw->curbe.need_new_bo || + brw->curbe.curbe_next_offset + bufsz > brw->curbe.curbe_bo->size)) { dri_bo_unreference(brw->curbe.curbe_bo); brw->curbe.curbe_bo = NULL; |