Mesa (master): st/mesa: Flush the bitmap cache in st_BlitFramebuffer

[Fredrik Höglund]

Module: Mesa
Branch: master
Commit: b3059bb7c53d33764b96b76971b3ff98675198c1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b3059bb7c53d33764b96b76971b3ff98675198c1

Author: Fredrik Höglund <fredrik at kde.org>
Date:   Fri May 15 19:30:38 2015 +0200

st/mesa: Flush the bitmap cache in st_BlitFramebuffer

With DSA we can no longer rely on this being done in st_validate_state
in response to the framebuffer bindings having changed.

This fixes the ext_framebuffer_multisample-bitmap piglit test.

Signed-off-by: Fredrik Höglund <fredrik at kde.org>
Reviewed-by: Brian Paul <brianp at vmware.com>

---

 src/mesa/state_tracker/st_cb_blit.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/mesa/state_tracker/st_cb_blit.c b/src/mesa/state_tracker/st_cb_blit.c
index bbaedd1..6d93718 100644
--- a/src/mesa/state_tracker/st_cb_blit.c
+++ b/src/mesa/state_tracker/st_cb_blit.c
@@ -36,6 +36,7 @@
 
 #include "st_context.h"
 #include "st_texture.h"
+#include "st_cb_bitmap.h"
 #include "st_cb_blit.h"
 #include "st_cb_fbo.h"
 #include "st_atom.h"
@@ -93,6 +94,9 @@ st_BlitFramebuffer(struct gl_context *ctx,
 
    st_validate_state(st);
 
+   /* Make sure bitmap rendering has landed in the framebuffers */
+   st_flush_bitmap_cache(st);
+
    clip.srcX0 = srcX0;
    clip.srcY0 = srcY0;
    clip.srcX1 = srcX1;