From ef9a619ba9c49e27ac3fd1c2925ae6b288cd4a09 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sun, 18 Apr 2010 17:38:49 -0600
Subject: [PATCH] st/mesa:
 s/st_sampler_view_from_texture/st_create_texture_sampler_view/

---
 src/mesa/state_tracker/st_atom_pixeltransfer.c | 2 +-
 src/mesa/state_tracker/st_cb_bitmap.c          | 4 ++--
 src/mesa/state_tracker/st_cb_drawpixels.c      | 4 ++--
 src/mesa/state_tracker/st_cb_fbo.c             | 2 +-
 src/mesa/state_tracker/st_texture.h            | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/mesa/state_tracker/st_atom_pixeltransfer.c b/src/mesa/state_tracker/st_atom_pixeltransfer.c
index 4aac5bd..e8e67f8 100644
--- a/src/mesa/state_tracker/st_atom_pixeltransfer.c
+++ b/src/mesa/state_tracker/st_atom_pixeltransfer.c
@@ -256,7 +256,7 @@ get_pixel_transfer_program(GLcontext *ctx, const struct state_key *key)
       /* create the colormap/texture now if not already done */
       if (!st->pixel_xfer.pixelmap_texture) {
          st->pixel_xfer.pixelmap_texture = create_color_map_texture(ctx);
-         st->pixel_xfer.pixelmap_sampler_view = st_sampler_view_from_texture(ctx->st->pipe,
+         st->pixel_xfer.pixelmap_sampler_view = st_create_texture_sampler_view(ctx->st->pipe,
                                                                              st->pixel_xfer.pixelmap_texture);
       }
 
diff --git a/src/mesa/state_tracker/st_cb_bitmap.c b/src/mesa/state_tracker/st_cb_bitmap.c
index 074fc27..12bba05 100644
--- a/src/mesa/state_tracker/st_cb_bitmap.c
+++ b/src/mesa/state_tracker/st_cb_bitmap.c
@@ -622,7 +622,7 @@ st_flush_bitmap_cache(struct st_context *st)
             cache->trans = NULL;
          }
 
-         sv = st_sampler_view_from_texture(st->pipe, cache->texture);
+         sv = st_create_texture_sampler_view(st->pipe, cache->texture);
          if (sv) {
             draw_bitmap_quad(st->ctx,
                              cache->xpos,
@@ -756,7 +756,7 @@ st_Bitmap(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height,
 
    pt = make_bitmap_texture(ctx, width, height, unpack, bitmap);
    if (pt) {
-      struct pipe_sampler_view *sv = st_sampler_view_from_texture(st->pipe, pt);
+      struct pipe_sampler_view *sv = st_create_texture_sampler_view(st->pipe, pt);
 
       assert(pt->target == PIPE_TEXTURE_2D);
 
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 955e371..2c18ded 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -834,7 +834,7 @@ st_DrawPixels(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height,
       struct pipe_resource *pt
          = make_texture(st, width, height, format, type, unpack, pixels);
       if (pt) {
-         struct pipe_sampler_view *sv = st_sampler_view_from_texture(st->pipe, pt);
+         struct pipe_sampler_view *sv = st_create_texture_sampler_view(st->pipe, pt);
 
          if (sv) {
             draw_textured_quad(ctx, x, y, ctx->Current.RasterPos[2],
@@ -1041,7 +1041,7 @@ st_CopyPixels(GLcontext *ctx, GLint srcx, GLint srcy,
    if (!pt)
       return;
 
-   sv = st_sampler_view_from_texture(st->pipe, pt);
+   sv = st_create_texture_sampler_view(st->pipe, pt);
    if (!sv) {
       pipe_resource_reference(&pt, NULL);
       return;
diff --git a/src/mesa/state_tracker/st_cb_fbo.c b/src/mesa/state_tracker/st_cb_fbo.c
index a69f5bf..728285f 100644
--- a/src/mesa/state_tracker/st_cb_fbo.c
+++ b/src/mesa/state_tracker/st_cb_fbo.c
@@ -546,7 +546,7 @@ st_renderbuffer_get_sampler_view(struct st_renderbuffer *rb,
                                  struct pipe_context *pipe)
 {
    if (!rb->sampler_view) {
-      rb->sampler_view = st_sampler_view_from_texture(pipe, rb->texture);
+      rb->sampler_view = st_create_texture_sampler_view(pipe, rb->texture);
    }
 
    return rb->sampler_view;
diff --git a/src/mesa/state_tracker/st_texture.h b/src/mesa/state_tracker/st_texture.h
index 12ef2d7..9fcf868 100644
--- a/src/mesa/state_tracker/st_texture.h
+++ b/src/mesa/state_tracker/st_texture.h
@@ -116,8 +116,8 @@ st_get_stobj_texture(struct st_texture_object *stObj)
 
 
 static INLINE struct pipe_sampler_view *
-st_sampler_view_from_texture(struct pipe_context *pipe,
-                             struct pipe_resource *texture)
+st_create_texture_sampler_view(struct pipe_context *pipe,
+                               struct pipe_resource *texture)
 {
    struct pipe_sampler_view templ;
 
@@ -137,7 +137,7 @@ st_get_texture_sampler_view(struct st_texture_object *stObj)
    }
 
    if (!stObj->sampler_view) {
-      stObj->sampler_view = st_sampler_view_from_texture(stObj->pipe, stObj->pt);
+      stObj->sampler_view = st_create_texture_sampler_view(stObj->pipe, stObj->pt);
    }
 
    return stObj->sampler_view;
-- 
2.7.4