From: Roland Scheidegger <sroland@vmware.com>
Date: Fri, 19 Mar 2010 15:30:47 +0000 (+0100)
Subject: cso: remove cso_set/save/restore_sampler_textures
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3b9555094d128052bdaf9957fe9062b35f7f5392;p=mesa.git

cso: remove cso_set/save/restore_sampler_textures

no longer used after all statetrackers have been converted.
---

diff --git a/src/gallium/auxiliary/cso_cache/cso_context.c b/src/gallium/auxiliary/cso_cache/cso_context.c
index 4ed9e09c529..d6f8dd34bfa 100644
--- a/src/gallium/auxiliary/cso_cache/cso_context.c
+++ b/src/gallium/auxiliary/cso_cache/cso_context.c
@@ -618,74 +618,6 @@ cso_restore_vertex_samplers(struct cso_context *ctx)
 }
 
 
-enum pipe_error cso_set_sampler_textures( struct cso_context *ctx,
-                                          uint count,
-                                          struct pipe_texture **textures )
-{
-   uint i;
-
-   ctx->nr_fragment_sampler_views = count;
-
-   for (i = 0; i < count; i++) {
-      struct pipe_sampler_view templ, *view;
-
-      u_sampler_view_default_template(&templ,
-                                      textures[i],
-                                      textures[i]->format);
-
-      view = ctx->pipe->create_sampler_view(ctx->pipe,
-                                            textures[i],
-                                            &templ);
-
-      pipe_sampler_view_reference(&ctx->fragment_sampler_views[i], view);
-   }
-   for ( ; i < PIPE_MAX_SAMPLERS; i++) {
-      pipe_sampler_view_reference(&ctx->fragment_sampler_views[i], NULL);
-   }
-
-   ctx->pipe->set_fragment_sampler_views(ctx->pipe,
-                                         count,
-                                         ctx->fragment_sampler_views);
-
-   return PIPE_OK;
-}
-
-void cso_save_sampler_textures( struct cso_context *ctx )
-{
-   uint i;
-
-   ctx->nr_fragment_sampler_views_saved = ctx->nr_fragment_sampler_views;
-   for (i = 0; i < ctx->nr_fragment_sampler_views; i++) {
-      assert(!ctx->fragment_sampler_views_saved[i]);
-
-      pipe_sampler_view_reference(&ctx->fragment_sampler_views_saved[i],
-                                  ctx->fragment_sampler_views[i]);
-   }
-}
-
-void cso_restore_sampler_textures( struct cso_context *ctx )
-{
-   uint i;
-
-   ctx->nr_fragment_sampler_views = ctx->nr_fragment_sampler_views_saved;
-
-   for (i = 0; i < ctx->nr_fragment_sampler_views; i++) {
-      pipe_sampler_view_reference(&ctx->fragment_sampler_views[i], NULL);
-      ctx->fragment_sampler_views[i] = ctx->fragment_sampler_views_saved[i];
-      ctx->fragment_sampler_views_saved[i] = NULL;
-   }
-   for ( ; i < PIPE_MAX_SAMPLERS; i++) {
-      pipe_sampler_view_reference(&ctx->fragment_sampler_views[i], NULL);
-   }
-
-   ctx->pipe->set_fragment_sampler_views(ctx->pipe,
-                                         ctx->nr_fragment_sampler_views,
-                                         ctx->fragment_sampler_views);
-
-   ctx->nr_fragment_sampler_views_saved = 0;
-}
-
-
 enum pipe_error cso_set_depth_stencil_alpha(struct cso_context *ctx,
                                             const struct pipe_depth_stencil_alpha_state *templ)
 {
diff --git a/src/gallium/auxiliary/cso_cache/cso_context.h b/src/gallium/auxiliary/cso_cache/cso_context.h
index a24077e009c..d6bcb1fe8f7 100644
--- a/src/gallium/auxiliary/cso_cache/cso_context.h
+++ b/src/gallium/auxiliary/cso_cache/cso_context.h
@@ -103,14 +103,6 @@ void
 cso_single_vertex_sampler_done(struct cso_context *cso);
 
 
-
-enum pipe_error cso_set_sampler_textures( struct cso_context *cso,
-                                          uint count,
-                                          struct pipe_texture **textures );
-void cso_save_sampler_textures( struct cso_context *cso );
-void cso_restore_sampler_textures( struct cso_context *cso );
-
-
 enum pipe_error cso_set_vertex_elements(struct cso_context *ctx,
                                         unsigned count,
                                         const struct pipe_vertex_element *states);