freedreno: move bind_sampler_states to per-generation

Keep the existing function as a common helper.  But this lets us move an
a2xx specific hack out of common code.  And the PIPE_TEX_WRAP_CLAMP
emulation will require an a3xx specific hack.  So rather than piling on
hacks, split this out.

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

diff --git a/src/gallium/drivers/freedreno/a2xx/fd2_texture.c b/src/gallium/drivers/freedreno/a2xx/fd2_texture.c
index 870694c2a1579f880bd13b40da51663e93c57dbc..e5e1f35b9c73efb8f9c697f7c2cdd852e70e5e7d 100644 (file)
--- a/src/gallium/drivers/freedreno/a2xx/fd2_texture.c
+++ b/src/gallium/drivers/freedreno/a2xx/fd2_texture.c
@@ -101,6 +101,25 @@ fd2_sampler_state_create(struct pipe_context *pctx,
        return so;
 }
 
+static void
+fd2_sampler_states_bind(struct pipe_context *pctx,
+               unsigned shader, unsigned start,
+               unsigned nr, void **hwcso)
+{
+       if (shader == PIPE_SHADER_FRAGMENT) {
+               struct fd_context *ctx = fd_context(pctx);
+
+               /* on a2xx, since there is a flat address space for textures/samplers,
+                * a change in # of fragment textures/samplers will trigger patching and
+                * re-emitting the vertex shader:
+                */
+               if (nr != ctx->fragtex.num_samplers)
+                       ctx->dirty |= FD_DIRTY_TEXSTATE;
+       }
+
+       fd_sampler_states_bind(pctx, shader, start, nr, hwcso);
+}
+
 static struct pipe_sampler_view *
 fd2_sampler_view_create(struct pipe_context *pctx, struct pipe_resource *prsc,
                const struct pipe_sampler_view *cso)
@@ -154,5 +173,6 @@ void
 fd2_texture_init(struct pipe_context *pctx)
 {
        pctx->create_sampler_state = fd2_sampler_state_create;
+       pctx->bind_sampler_states = fd2_sampler_states_bind;
        pctx->create_sampler_view = fd2_sampler_view_create;
 }

diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_texture.c b/src/gallium/drivers/freedreno/a3xx/fd3_texture.c
index 436d51af7b649064dd68ccec398fd9d3169489ec..918dcc491f2e3a880cb1a5f65308e86b9a4ad2ee 100644 (file)
--- a/src/gallium/drivers/freedreno/a3xx/fd3_texture.c
+++ b/src/gallium/drivers/freedreno/a3xx/fd3_texture.c
@@ -119,6 +119,14 @@ fd3_sampler_state_create(struct pipe_context *pctx,
        return so;
 }
 
+static void
+fd3_sampler_states_bind(struct pipe_context *pctx,
+               unsigned shader, unsigned start,
+               unsigned nr, void **hwcso)
+{
+       fd_sampler_states_bind(pctx, shader, start, nr, hwcso);
+}
+
 static enum a3xx_tex_type
 tex_type(unsigned target)
 {
@@ -204,5 +212,6 @@ void
 fd3_texture_init(struct pipe_context *pctx)
 {
        pctx->create_sampler_state = fd3_sampler_state_create;
+       pctx->bind_sampler_states = fd3_sampler_states_bind;
        pctx->create_sampler_view = fd3_sampler_view_create;
 }

diff --git a/src/gallium/drivers/freedreno/freedreno_texture.c b/src/gallium/drivers/freedreno/freedreno_texture.c
index 212e5063c600cc43b5de99c90bcd1a08a4d9b284..e61bf8a612d1e1dc6e62112726341904facc521e 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_texture.c
+++ b/src/gallium/drivers/freedreno/freedreno_texture.c
@@ -49,7 +49,7 @@ fd_sampler_view_destroy(struct pipe_context *pctx,
        FREE(view);
 }
 
-static void bind_sampler_states(struct fd_texture_stateobj *prog,
+static void bind_sampler_states(struct fd_texture_stateobj *tex,
                unsigned nr, void **hwcso)
 {
        unsigned i;
@@ -58,19 +58,19 @@ static void bind_sampler_states(struct fd_texture_stateobj *prog,
        for (i = 0; i < nr; i++) {
                if (hwcso[i])
                        new_nr = i + 1;
-               prog->samplers[i] = hwcso[i];
-               prog->dirty_samplers |= (1 << i);
+               tex->samplers[i] = hwcso[i];
+               tex->dirty_samplers |= (1 << i);
        }
 
-       for (; i < prog->num_samplers; i++) {
-               prog->samplers[i] = NULL;
-               prog->dirty_samplers |= (1 << i);
+       for (; i < tex->num_samplers; i++) {
+               tex->samplers[i] = NULL;
+               tex->dirty_samplers |= (1 << i);
        }
 
-       prog->num_samplers = new_nr;
+       tex->num_samplers = new_nr;
 }
 
-static void set_sampler_views(struct fd_texture_stateobj *prog,
+static void set_sampler_views(struct fd_texture_stateobj *tex,
                unsigned nr, struct pipe_sampler_view **views)
 {
        unsigned i;
@@ -79,19 +79,19 @@ static void set_sampler_views(struct fd_texture_stateobj *prog,
        for (i = 0; i < nr; i++) {
                if (views[i])
                        new_nr = i + 1;
-               pipe_sampler_view_reference(&prog->textures[i], views[i]);
-               prog->dirty_samplers |= (1 << i);
+               pipe_sampler_view_reference(&tex->textures[i], views[i]);
+               tex->dirty_samplers |= (1 << i);
        }
 
-       for (; i < prog->num_textures; i++) {
-               pipe_sampler_view_reference(&prog->textures[i], NULL);
-               prog->dirty_samplers |= (1 << i);
+       for (; i < tex->num_textures; i++) {
+               pipe_sampler_view_reference(&tex->textures[i], NULL);
+               tex->dirty_samplers |= (1 << i);
        }
 
-       prog->num_textures = new_nr;
+       tex->num_textures = new_nr;
 }
 
-static void
+void
 fd_sampler_states_bind(struct pipe_context *pctx,
                unsigned shader, unsigned start,
                unsigned nr, void **hwcso)
@@ -101,13 +101,6 @@ fd_sampler_states_bind(struct pipe_context *pctx,
        assert(start == 0);
 
        if (shader == PIPE_SHADER_FRAGMENT) {
-               /* on a2xx, since there is a flat address space for textures/samplers,
-                * a change in # of fragment textures/samplers will trigger patching and
-                * re-emitting the vertex shader:
-                */
-               if (nr != ctx->fragtex.num_samplers)
-                       ctx->dirty |= FD_DIRTY_TEXSTATE;
-
                bind_sampler_states(&ctx->fragtex, nr, hwcso);
                ctx->dirty |= FD_DIRTY_FRAGTEX;
        }
@@ -169,6 +162,5 @@ fd_texture_init(struct pipe_context *pctx)
 
        pctx->sampler_view_destroy = fd_sampler_view_destroy;
 
-       pctx->bind_sampler_states = fd_sampler_states_bind;
        pctx->set_sampler_views = fd_set_sampler_views;
 }

diff --git a/src/gallium/drivers/freedreno/freedreno_texture.h b/src/gallium/drivers/freedreno/freedreno_texture.h
index f73110dde123b89951d17b8ca1204751641dfea9..388b980d8575841a46ff2629ab35be4dfd766e28 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_texture.h
+++ b/src/gallium/drivers/freedreno/freedreno_texture.h
@@ -31,6 +31,10 @@
 
 #include "pipe/p_context.h"
 
+void fd_sampler_states_bind(struct pipe_context *pctx,
+               unsigned shader, unsigned start,
+               unsigned nr, void **hwcso);
+
 void fd_texture_init(struct pipe_context *pctx);
 
 #endif /* FREEDRENO_TEXTURE_H_ */