From c542b7e43d3a504456518c9f407e21c4e7e5fa88 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolai=20H=C3=A4hnle?= Date: Thu, 9 Jun 2016 12:12:34 +0200 Subject: [PATCH] st/mesa: flush bitmap cache before compute dispatch MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit In the unlikely case that a program uses glBitmap to render to a framebuffer whose texture is bound in a compute shader. Found by inspection. Cc: 11.2 12.0 Reviewed-by: Marek Olšák --- src/mesa/state_tracker/st_cb_compute.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mesa/state_tracker/st_cb_compute.c b/src/mesa/state_tracker/st_cb_compute.c index bfc6d96cd57..063d750d03a 100644 --- a/src/mesa/state_tracker/st_cb_compute.c +++ b/src/mesa/state_tracker/st_cb_compute.c @@ -28,6 +28,7 @@ #include "main/state.h" #include "st_atom.h" #include "st_context.h" +#include "st_cb_bitmap.h" #include "st_cb_bufferobjects.h" #include "st_cb_compute.h" @@ -44,6 +45,8 @@ static void st_dispatch_compute_common(struct gl_context *ctx, struct pipe_context *pipe = st->pipe; struct pipe_grid_info info = { 0 }; + st_flush_bitmap_cache(st); + if (ctx->NewState) _mesa_update_state(ctx); -- 2.30.2