freedreno/a5xx: work around SWAP vs TILE_MODE constraint

[mesa.git] / src / gallium / drivers / freedreno / freedreno_state.c

diff --git a/src/gallium/drivers/freedreno/freedreno_state.c b/src/gallium/drivers/freedreno/freedreno_state.c
index 012e2b3e9bfbc1620a9b5485c034e0ca86b7ac16..dd42aa02e7597a792a65c34b48086f2fd853235d 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_state.c
+++ b/src/gallium/drivers/freedreno/freedreno_state.c
@@ -161,6 +161,53 @@ fd_set_shader_buffers(struct pipe_context *pctx,
        ctx->dirty_shader[shader] |= FD_DIRTY_SHADER_SSBO;
 }
 
+static void
+fd_set_shader_images(struct pipe_context *pctx,
+               enum pipe_shader_type shader,
+               unsigned start, unsigned count,
+               const struct pipe_image_view *images)
+{
+       struct fd_context *ctx = fd_context(pctx);
+       struct fd_shaderimg_stateobj *so = &ctx->shaderimg[shader];
+
+       unsigned mask = 0;
+
+       if (images) {
+               for (unsigned i = 0; i < count; i++) {
+                       unsigned n = i + start;
+                       struct pipe_image_view *buf = &so->si[n];
+
+                       if ((buf->resource == images[i].resource) &&
+                                       (buf->format == images[i].format) &&
+                                       (buf->access == images[i].access) &&
+                                       !memcmp(&buf->u, &images[i].u, sizeof(buf->u)))
+                               continue;
+
+                       mask |= BIT(n);
+                       util_copy_image_view(buf, &images[i]);
+
+                       if (buf->resource)
+                               so->enabled_mask |= BIT(n);
+                       else
+                               so->enabled_mask &= ~BIT(n);
+               }
+       } else {
+               mask = (BIT(count) - 1) << start;
+
+               for (unsigned i = 0; i < count; i++) {
+                       unsigned n = i + start;
+                       struct pipe_image_view *img = &so->si[n];
+
+                       pipe_resource_reference(&img->resource, NULL);
+               }
+
+               so->enabled_mask &= ~mask;
+       }
+
+       so->dirty_mask |= mask;
+       ctx->dirty_shader[shader] |= FD_DIRTY_SHADER_IMAGE;
+}
+
 static void
 fd_set_framebuffer_state(struct pipe_context *pctx,
                const struct pipe_framebuffer_state *framebuffer)
@@ -188,14 +235,14 @@ fd_set_framebuffer_state(struct pipe_context *pctx,
                         * multiple times to the same surface), so we might as
                         * well go ahead and flush this one:
                         */
-                       fd_batch_flush(old_batch, false);
+                       fd_batch_flush(old_batch, false, false);
                }
 
                fd_batch_reference(&old_batch, NULL);
        } else {
                DBG("%d: cbufs[0]=%p, zsbuf=%p", ctx->batch->needs_flush,
                                framebuffer->cbufs[0], framebuffer->zsbuf);
-               fd_batch_flush(ctx->batch, false);
+               fd_batch_flush(ctx->batch, false, false);
        }
 
        cso = &ctx->batch->framebuffer;
@@ -385,7 +432,7 @@ fd_create_stream_output_target(struct pipe_context *pctx,
        target->buffer_offset = buffer_offset;
        target->buffer_size = buffer_size;
 
-       assert(rsc->base.b.target == PIPE_BUFFER);
+       assert(rsc->base.target == PIPE_BUFFER);
        util_range_add(&rsc->valid_buffer_range,
                buffer_offset, buffer_offset + buffer_size);
 
@@ -468,6 +515,7 @@ fd_state_init(struct pipe_context *pctx)
        pctx->set_sample_mask = fd_set_sample_mask;
        pctx->set_constant_buffer = fd_set_constant_buffer;
        pctx->set_shader_buffers = fd_set_shader_buffers;
+       pctx->set_shader_images = fd_set_shader_images;
        pctx->set_framebuffer_state = fd_set_framebuffer_state;
        pctx->set_polygon_stipple = fd_set_polygon_stipple;
        pctx->set_scissor_states = fd_set_scissor_states;