Merge Mesa 20.1.6

1 files changed, 5 insertions, 0 deletions

diff --git a/lib/mesa/src/gallium/drivers/llvmpipe/lp_setup_context.h b/lib/mesa/src/gallium/drivers/llvmpipe/lp_setup_context.h
index 9c8dde5b6..701dcadfd 100644
--- a/lib/mesa/src/gallium/drivers/llvmpipe/lp_setup_context.h
+++ b/lib/mesa/src/gallium/drivers/llvmpipe/lp_setup_context.h
@@ -50,6 +50,7 @@
 #define LP_SETUP_NEW_SCISSOR     0x08
 #define LP_SETUP_NEW_VIEWPORTS   0x10
 #define LP_SETUP_NEW_SSBOS       0x20
+#define LP_SETUP_NEW_IMAGES      0x40
 
 struct lp_setup_variant;
 
@@ -149,6 +150,10 @@ struct lp_setup_context
    } ssbos[LP_MAX_TGSI_SHADER_BUFFERS];
 
    struct {
+      struct pipe_image_view current;
+   } images[LP_MAX_TGSI_SHADER_IMAGES];
+
+   struct {
       struct pipe_blend_color current;
       uint8_t *stored;
    } blend_color;