freedreno/a4xx: border-color support

Signed-off-by: Rob Clark <robclark@freedesktop.org>

diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_context.c b/src/gallium/drivers/freedreno/a4xx/fd4_context.c
index 625512ccd1bc4b2e5228d30efb43041caeaad01b..e53e0c56c9ab8767041f51d85bdd1d4cd9bfa596 100644 (file)
--- a/src/gallium/drivers/freedreno/a4xx/fd4_context.c
+++ b/src/gallium/drivers/freedreno/a4xx/fd4_context.c
@@ -55,6 +55,8 @@ fd4_context_destroy(struct pipe_context *pctx)
        pipe_resource_reference(&fd4_ctx->solid_vbuf, NULL);
        pipe_resource_reference(&fd4_ctx->blit_texcoord_vbuf, NULL);
 
+       u_upload_destroy(fd4_ctx->border_color_uploader);
+
        fd_context_destroy(pctx);
 }
 
@@ -169,5 +171,8 @@ fd4_context_create(struct pipe_screen *pscreen, void *priv, unsigned flags)
 
        fd4_query_context_init(pctx);
 
+       fd4_ctx->border_color_uploader = u_upload_create(pctx, 4096,
+                       2 * PIPE_MAX_SAMPLERS * BORDERCOLOR_SIZE, 0);
+
        return pctx;
 }

diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_context.h b/src/gallium/drivers/freedreno/a4xx/fd4_context.h
index af9475699db39400ce6424542387c2679faacf9a..074c5a752bf646143505fd787fd585c994da2696 100644 (file)
--- a/src/gallium/drivers/freedreno/a4xx/fd4_context.h
+++ b/src/gallium/drivers/freedreno/a4xx/fd4_context.h
@@ -29,6 +29,8 @@
 #ifndef FD4_CONTEXT_H_
 #define FD4_CONTEXT_H_
 
+#include "util/u_upload_mgr.h"
+
 #include "freedreno_drmif.h"
 
 #include "freedreno_context.h"
@@ -70,6 +72,9 @@ struct fd4_context {
         */
        struct fd_vertex_state blit_vbuf_state;
 
+       struct u_upload_mgr *border_color_uploader;
+       struct pipe_resource *border_color_buf;
+
        /* if *any* of bits are set in {v,f}saturate_{s,t,r} */
        bool vsaturate, fsaturate;
 

diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_emit.c b/src/gallium/drivers/freedreno/a4xx/fd4_emit.c
index b75be29e523ab9bef7db097f76596ee80b4db6d9..5f36cef3e9a74d8fb9dfe1ba5c754e80f6d27e8c 100644 (file)
--- a/src/gallium/drivers/freedreno/a4xx/fd4_emit.c
+++ b/src/gallium/drivers/freedreno/a4xx/fd4_emit.c
@@ -124,7 +124,20 @@ static void
 emit_textures(struct fd_context *ctx, struct fd_ringbuffer *ring,
                enum adreno_state_block sb, struct fd_texture_stateobj *tex)
 {
-       unsigned i;
+       static const uint32_t bcolor_reg[] = {
+                       [SB_VERT_TEX] = REG_A4XX_TPL1_TP_VS_BORDER_COLOR_BASE_ADDR,
+                       [SB_FRAG_TEX] = REG_A4XX_TPL1_TP_FS_BORDER_COLOR_BASE_ADDR,
+       };
+       struct fd4_context *fd4_ctx = fd4_context(ctx);
+       unsigned i, off;
+       void *ptr;
+
+       u_upload_alloc(fd4_ctx->border_color_uploader,
+                       0, 2 * PIPE_MAX_SAMPLERS * BORDERCOLOR_SIZE, &off,
+                       &fd4_ctx->border_color_buf,
+                       &ptr);
+
+       fd_setup_border_colors(tex, ptr, 0);
 
        if (tex->num_samplers > 0) {
                int num_samplers;
@@ -190,6 +203,11 @@ emit_textures(struct fd_context *ctx, struct fd_ringbuffer *ring,
                        OUT_RING(ring, 0x00000000);
                }
        }
+
+       OUT_PKT0(ring, bcolor_reg[sb], 1);
+       OUT_RELOC(ring, fd_resource(fd4_ctx->border_color_buf)->bo, off, 0, 0);
+
+       u_upload_unmap(fd4_ctx->border_color_uploader);
 }
 
 /* emit texture state for mem->gmem restore operation.. eventually it would

diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_texture.c b/src/gallium/drivers/freedreno/a4xx/fd4_texture.c
index 5ee022b30a94c1c3a84de78d898123f8b8c7cea9..dbff5a738fd6a42583cabde2a7b0e96c3f31dc15 100644 (file)
--- a/src/gallium/drivers/freedreno/a4xx/fd4_texture.c
+++ b/src/gallium/drivers/freedreno/a4xx/fd4_texture.c
@@ -49,12 +49,13 @@ tex_clamp(unsigned wrap, bool clamp_to_edge)
                return A4XX_TEX_REPEAT;
        case PIPE_TEX_WRAP_CLAMP_TO_EDGE:
                return A4XX_TEX_CLAMP_TO_EDGE;
+       case PIPE_TEX_WRAP_CLAMP_TO_BORDER:
+               return A4XX_TEX_CLAMP_TO_BORDER;
        case PIPE_TEX_WRAP_MIRROR_CLAMP_TO_EDGE:
                /* only works for PoT.. need to emulate otherwise! */
                return A4XX_TEX_MIRROR_CLAMP;
        case PIPE_TEX_WRAP_MIRROR_REPEAT:
                return A4XX_TEX_MIRROR_REPEAT;
-       case PIPE_TEX_WRAP_CLAMP_TO_BORDER:
        case PIPE_TEX_WRAP_MIRROR_CLAMP:
        case PIPE_TEX_WRAP_MIRROR_CLAMP_TO_BORDER:
                /* these two we could perhaps emulate, but we currently