vc4: Add support for 16-bit signed/unsigned norm/scaled vertex attrs.

[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 2f5d52c017c3ca3dd3b91ca12019b1a8fb4b3c2f..6293f439125a876ce3d8db496d519afebaef8b03 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_state.c
+++ b/src/gallium/drivers/freedreno/freedreno_state.c
@@ -117,23 +117,17 @@ fd_set_framebuffer_state(struct pipe_context *pctx,
 {
        struct fd_context *ctx = fd_context(pctx);
        struct pipe_framebuffer_state *cso = &ctx->framebuffer;
-       unsigned i;
 
        DBG("%d: cbufs[0]=%p, zsbuf=%p", ctx->needs_flush,
-                       cso->cbufs[0], cso->zsbuf);
+                       framebuffer->cbufs[0], framebuffer->zsbuf);
 
        fd_context_render(pctx);
 
-       for (i = 0; i < framebuffer->nr_cbufs; i++)
-               pipe_surface_reference(&cso->cbufs[i], framebuffer->cbufs[i]);
-       for (; i < ctx->framebuffer.nr_cbufs; i++)
-               pipe_surface_reference(&cso->cbufs[i], NULL);
+       util_copy_framebuffer_state(cso, framebuffer);
 
-       cso->nr_cbufs = framebuffer->nr_cbufs;
-       cso->width = framebuffer->width;
-       cso->height = framebuffer->height;
-
-       pipe_surface_reference(&cso->zsbuf, framebuffer->zsbuf);
+       if ((cso->width != framebuffer->width) ||
+                       (cso->height != framebuffer->height))
+               ctx->needs_rb_fbd = true;
 
        ctx->dirty |= FD_DIRTY_FRAMEBUFFER;
 
@@ -183,7 +177,7 @@ fd_set_vertex_buffers(struct pipe_context *pctx,
                const struct pipe_vertex_buffer *vb)
 {
        struct fd_context *ctx = fd_context(pctx);
-       struct fd_vertexbuf_stateobj *so = &ctx->vertexbuf;
+       struct fd_vertexbuf_stateobj *so = &ctx->vtx.vertexbuf;
        int i;
 
        /* on a2xx, pitch is encoded in the vtx fetch instruction, so
@@ -243,8 +237,18 @@ static void
 fd_rasterizer_state_bind(struct pipe_context *pctx, void *hwcso)
 {
        struct fd_context *ctx = fd_context(pctx);
+       struct pipe_scissor_state *old_scissor = fd_context_get_scissor(ctx);
+
        ctx->rasterizer = hwcso;
        ctx->dirty |= FD_DIRTY_RASTERIZER;
+
+       /* if scissor enable bit changed we need to mark scissor
+        * state as dirty as well:
+        * NOTE: we can do a shallow compare, since we only care
+        * if it changed to/from &ctx->disable_scissor
+        */
+       if (old_scissor != fd_context_get_scissor(ctx))
+               ctx->dirty |= FD_DIRTY_SCISSOR;
 }
 
 static void
@@ -292,7 +296,7 @@ static void
 fd_vertex_state_bind(struct pipe_context *pctx, void *hwcso)
 {
        struct fd_context *ctx = fd_context(pctx);
-       ctx->vtx = hwcso;
+       ctx->vtx.vtx = hwcso;
        ctx->dirty |= FD_DIRTY_VTXSTATE;
 }