From d082c5324914212f76e45be497229c7a0681f706 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Thu, 16 Jul 2015 17:14:07 +0200 Subject: [PATCH] st/mesa: don't call st_validate_state in BlitFramebuffer None of the draw states are used here. This fixes a crash in piglit: ext_framebuffer_blit/blit-early Calling st_manager_validate_framebuffers is the minimum requirement here. Cc: mesa-stable@lists.freedesktop.org --- src/mesa/state_tracker/st_cb_blit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesa/state_tracker/st_cb_blit.c b/src/mesa/state_tracker/st_cb_blit.c index 6d93718..1396906 100644 --- a/src/mesa/state_tracker/st_cb_blit.c +++ b/src/mesa/state_tracker/st_cb_blit.c @@ -39,7 +39,7 @@ #include "st_cb_bitmap.h" #include "st_cb_blit.h" #include "st_cb_fbo.h" -#include "st_atom.h" +#include "st_manager.h" #include "util/u_format.h" @@ -92,7 +92,7 @@ st_BlitFramebuffer(struct gl_context *ctx, } clip; struct pipe_blit_info blit; - st_validate_state(st); + st_manager_validate_framebuffers(st); /* Make sure bitmap rendering has landed in the framebuffers */ st_flush_bitmap_cache(st); -- 2.7.4