diff options
| author | Christian König <[email protected]> | 2011-07-04 15:04:41 +0200 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-07-04 15:04:41 +0200 |
| commit | c3b2230b71cb3a00a7f4c0987197d397bada650b (patch) | |
| tree | 018f5df0f8b5976ddb56ef4f13e9466587838998 /src/mesa/main/texobj.c | |
| parent | 003401f95c9b59471c22368b7da16fe7a951e490 (diff) | |
| parent | 424b1210d951c206e7c2fb8f2778acbd384eb247 (diff) | |
Merge remote-tracking branch 'origin/master' into pipe-video
Conflicts:
configure.ac
src/gallium/drivers/r600/r600_state_inlines.h
src/gallium/tests/trivial/Makefile
src/gallium/winsys/g3dvl/dri/XF86dri.c
src/gallium/winsys/g3dvl/dri/driclient.c
src/gallium/winsys/g3dvl/dri/driclient.h
src/gallium/winsys/g3dvl/dri/xf86dri.h
src/gallium/winsys/g3dvl/dri/xf86dristr.h
src/gallium/winsys/r600/drm/r600_bo.c
Diffstat (limited to 'src/mesa/main/texobj.c')
| -rw-r--r-- | src/mesa/main/texobj.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index fdf12817c9a..565a3a2d8df 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -879,6 +879,8 @@ unbind_texobj_from_fbo(struct gl_context *ctx, for (j = 0; j < BUFFER_COUNT; j++) { if (fb->Attachment[j].Type == GL_TEXTURE && fb->Attachment[j].Texture == texObj) { + /* Vertices are already flushed by _mesa_DeleteTextures */ + ctx->NewState |= _NEW_BUFFERS; _mesa_remove_attachment(ctx, fb->Attachment + j); } } |