freedreno: cleanup fd_set_sampler_views

The separate FS/VS entrypoints are no longer used since a3ed98f.  So
just inline them.

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

diff --git a/src/gallium/drivers/freedreno/freedreno_texture.c b/src/gallium/drivers/freedreno/freedreno_texture.c
index f5611abaec8d72c6a70cb90b0c7bd29b9a2ec0f5..a301811995d4ce2128db3fe6747857e6fbd8f1dd 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_texture.c
+++ b/src/gallium/drivers/freedreno/freedreno_texture.c
@@ -110,49 +110,36 @@ fd_sampler_states_bind(struct pipe_context *pctx,
        }
 }
 
-
-static void
-fd_fragtex_set_sampler_views(struct pipe_context *pctx, unsigned nr,
+void
+fd_set_sampler_views(struct pipe_context *pctx, unsigned shader,
+               unsigned start, unsigned nr,
                struct pipe_sampler_view **views)
 {
        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_textures)
-               ctx->dirty |= FD_DIRTY_TEXSTATE;
-
-       set_sampler_views(&ctx->fragtex, nr, views);
-       ctx->dirty |= FD_DIRTY_FRAGTEX;
-}
+       assert(start == 0);
 
-static void
-fd_verttex_set_sampler_views(struct pipe_context *pctx, unsigned nr,
-               struct pipe_sampler_view **views)
-{
-       struct fd_context *ctx = fd_context(pctx);
-       set_sampler_views(&ctx->verttex, nr, views);
-       ctx->dirty |= FD_DIRTY_VERTTEX;
-}
+       switch (shader) {
+       case 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:
+                *
+                * (note: later gen's ignore FD_DIRTY_TEXSTATE so fine to set it)
+                */
+               if (nr != ctx->fragtex.num_textures)
+                       ctx->dirty |= FD_DIRTY_TEXSTATE;
 
-void
-fd_set_sampler_views(struct pipe_context *pctx, unsigned shader,
-                     unsigned start, unsigned nr,
-                     struct pipe_sampler_view **views)
-{
-   assert(start == 0);
-   switch (shader) {
-   case PIPE_SHADER_FRAGMENT:
-      fd_fragtex_set_sampler_views(pctx, nr, views);
-      break;
-   case PIPE_SHADER_VERTEX:
-      fd_verttex_set_sampler_views(pctx, nr, views);
-      break;
-   default:
-      ;
-   }
+               set_sampler_views(&ctx->fragtex, nr, views);
+               ctx->dirty |= FD_DIRTY_FRAGTEX;
+               break;
+       case PIPE_SHADER_VERTEX:
+               set_sampler_views(&ctx->verttex, nr, views);
+               ctx->dirty |= FD_DIRTY_VERTTEX;
+               break;
+       default:
+               break;
+       }
 }
 
 void