Module: Mesa Branch: 7.10 Commit: 7fcaf9ae80f82e37b82cfca367428730ebf097d5 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7fcaf9ae80f82e37b82cfca367428730ebf097d5
Author: Henri Verbeet <[email protected]> Date: Wed Mar 23 21:58:06 2011 +0100 st/mesa: Validate state before doing blits. Specifically, this ensures things like the front buffer actually exist. This fixes piglt fbo/fbo-sys-blit and fd.o bug 35483. Signed-off-by: Henri Verbeet <[email protected]> (cherry picked from commit 5d7c27f5ec2f30c264dc2d53c4980970b3a13ee5) --- src/mesa/state_tracker/st_cb_blit.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/mesa/state_tracker/st_cb_blit.c b/src/mesa/state_tracker/st_cb_blit.c index 06cee52..d9eb806 100644 --- a/src/mesa/state_tracker/st_cb_blit.c +++ b/src/mesa/state_tracker/st_cb_blit.c @@ -38,6 +38,7 @@ #include "st_texture.h" #include "st_cb_blit.h" #include "st_cb_fbo.h" +#include "st_atom.h" #include "util/u_blit.h" #include "util/u_inlines.h" @@ -75,6 +76,8 @@ st_BlitFramebuffer(struct gl_context *ctx, struct gl_framebuffer *readFB = ctx->ReadBuffer; struct gl_framebuffer *drawFB = ctx->DrawBuffer; + st_validate_state(st); + if (!_mesa_clip_blit(ctx, &srcX0, &srcY0, &srcX1, &srcY1, &dstX0, &dstY0, &dstX1, &dstY1)) { return; /* nothing to draw/blit */ _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
