freedreno: Remove the Emacs mode lines

[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 0b37bd31cc654c15195cd3c4f424edde50537738..9bdc99c8707629a4ad3b25630a29d986e994015c 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_state.c
+++ b/src/gallium/drivers/freedreno/freedreno_state.c
@@ -1,5 +1,3 @@
-/* -*- mode: C; c-file-style: "k&r"; tab-width 4; indent-tabs-mode: t; -*- */
-
 /*
  * Copyright (C) 2012 Rob Clark <robclark@freedesktop.org>
  *
@@ -103,12 +101,10 @@ fd_set_constant_buffer(struct pipe_context *pctx,
         */
        if (unlikely(!cb)) {
                so->enabled_mask &= ~(1 << index);
-               so->dirty_mask &= ~(1 << index);
                return;
        }
 
        so->enabled_mask |= 1 << index;
-       so->dirty_mask |= 1 << index;
        ctx->dirty_shader[shader] |= FD_DIRTY_SHADER_CONST;
        ctx->dirty |= FD_DIRTY_CONST;
 }
@@ -157,7 +153,6 @@ fd_set_shader_buffers(struct pipe_context *pctx,
                so->enabled_mask &= ~mask;
        }
 
-       so->dirty_mask |= mask;
        ctx->dirty_shader[shader] |= FD_DIRTY_SHADER_SSBO;
 }
 
@@ -204,7 +199,6 @@ fd_set_shader_images(struct pipe_context *pctx,
                so->enabled_mask &= ~mask;
        }
 
-       so->dirty_mask |= mask;
        ctx->dirty_shader[shader] |= FD_DIRTY_SHADER_IMAGE;
 }
 
@@ -215,18 +209,25 @@ fd_set_framebuffer_state(struct pipe_context *pctx,
        struct fd_context *ctx = fd_context(pctx);
        struct pipe_framebuffer_state *cso;
 
+       DBG("%ux%u, %u layers, %u samples",
+               framebuffer->width, framebuffer->height,
+               framebuffer->layers, framebuffer->samples);
+
+       cso = &ctx->framebuffer;
+
+       util_copy_framebuffer_state(cso, framebuffer);
+
+       cso->samples = util_framebuffer_get_num_samples(cso);
+
        if (ctx->screen->reorder) {
-               struct fd_batch *batch, *old_batch = NULL;
+               struct fd_batch *old_batch = NULL;
 
                fd_batch_reference(&old_batch, ctx->batch);
 
                if (likely(old_batch))
                        fd_batch_set_stage(old_batch, FD_STAGE_NULL);
 
-               batch = fd_batch_from_fb(&ctx->screen->batch_cache, ctx, framebuffer);
                fd_batch_reference(&ctx->batch, NULL);
-               fd_reset_wfi(batch);
-               ctx->batch = batch;
                fd_context_all_dirty(ctx);
 
                if (old_batch && old_batch->blit && !old_batch->back_blit) {
@@ -235,20 +236,17 @@ 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);
+               util_copy_framebuffer_state(&ctx->batch->framebuffer, cso);
        }
 
-       cso = &ctx->batch->framebuffer;
-
-       util_copy_framebuffer_state(cso, framebuffer);
-
        ctx->dirty |= FD_DIRTY_FRAMEBUFFER;
 
        ctx->disabled_scissor.minx = 0;
@@ -432,7 +430,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);
 
@@ -495,15 +493,53 @@ fd_set_compute_resources(struct pipe_context *pctx,
        // TODO
 }
 
+/* used by clover to bind global objects, returning the bo address
+ * via handles[n]
+ */
 static void
 fd_set_global_binding(struct pipe_context *pctx,
                unsigned first, unsigned count, struct pipe_resource **prscs,
                uint32_t **handles)
 {
-       /* TODO only used by clover.. seems to need us to return the actual
-        * gpuaddr of the buffer.. which isn't really exposed to mesa atm.
-        * How is this used?
-        */
+       struct fd_context *ctx = fd_context(pctx);
+       struct fd_global_bindings_stateobj *so = &ctx->global_bindings;
+       unsigned mask = 0;
+
+       if (prscs) {
+               for (unsigned i = 0; i < count; i++) {
+                       unsigned n = i + first;
+
+                       mask |= BIT(n);
+
+                       pipe_resource_reference(&so->buf[n], prscs[i]);
+
+                       if (so->buf[n]) {
+                               struct fd_resource *rsc = fd_resource(so->buf[n]);
+                               uint64_t iova = fd_bo_get_iova(rsc->bo);
+                               // TODO need to scream if iova > 32b or fix gallium API..
+                               *handles[i] += iova;
+                       }
+
+                       if (prscs[i])
+                               so->enabled_mask |= BIT(n);
+                       else
+                               so->enabled_mask &= ~BIT(n);
+               }
+       } else {
+               mask = (BIT(count) - 1) << first;
+
+               for (unsigned i = 0; i < count; i++) {
+                       unsigned n = i + first;
+                       if (so->buf[n]) {
+                               struct fd_resource *rsc = fd_resource(so->buf[n]);
+                               fd_bo_put_iova(rsc->bo);
+                       }
+                       pipe_resource_reference(&so->buf[n], NULL);
+               }
+
+               so->enabled_mask &= ~mask;
+       }
+
 }
 
 void