st/mesa: Validate state before doing blits.
authorHenri Verbeet <hverbeet@gmail.com>
Wed, 23 Mar 2011 20:58:06 +0000 (21:58 +0100)
committerHenri Verbeet <hverbeet@gmail.com>
Sun, 27 Mar 2011 13:01:59 +0000 (15:01 +0200)
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 <hverbeet@gmail.com>
src/mesa/state_tracker/st_cb_blit.c

index 6d02a7dccd477e5284ec1723990aaf5530311d4c..25c95c7b9dc8e4148837481a5314cc8a60997326 100644 (file)
@@ -39,6 +39,7 @@
 #include "st_texture.h"
 #include "st_cb_blit.h"
 #include "st_cb_fbo.h"
+#include "st_atom.h"
 
 #include "util/u_blit.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 */