From 8a7ea577ac924016db5f86cbb408dd8e218c6782 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sun, 18 Apr 2010 17:12:39 -0600
Subject: [PATCH] st/mesa:
 s/st_get_stobj_sampler_view/st_get_texture_sampler_view/

---
 src/mesa/state_tracker/st_atom_texture.c | 2 +-
 src/mesa/state_tracker/st_cb_blit.c      | 2 +-
 src/mesa/state_tracker/st_cb_fbo.c       | 2 +-
 src/mesa/state_tracker/st_cb_texture.c   | 2 +-
 src/mesa/state_tracker/st_gen_mipmap.c   | 2 +-
 src/mesa/state_tracker/st_texture.h      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/mesa/state_tracker/st_atom_texture.c b/src/mesa/state_tracker/st_atom_texture.c
index 241c001f94f..e056487f1a6 100644
--- a/src/mesa/state_tracker/st_atom_texture.c
+++ b/src/mesa/state_tracker/st_atom_texture.c
@@ -84,7 +84,7 @@ update_textures(struct st_context *st)
 
          st->state.num_textures = su + 1;
 
-         sampler_view = st_get_stobj_sampler_view(stObj);
+         sampler_view = st_get_texture_sampler_view(stObj);
       }
 
       /*
diff --git a/src/mesa/state_tracker/st_cb_blit.c b/src/mesa/state_tracker/st_cb_blit.c
index 0498080ccfc..32c9a636d2a 100644
--- a/src/mesa/state_tracker/st_cb_blit.c
+++ b/src/mesa/state_tracker/st_cb_blit.c
@@ -133,7 +133,7 @@ st_BlitFramebuffer(GLcontext *ctx,
             return;
 
          util_blit_pixels(st->blit,
-                          srcSurf, st_get_stobj_sampler_view(srcObj),
+                          srcSurf, st_get_texture_sampler_view(srcObj),
                           srcX0, srcY0, srcX1, srcY1,
                           dstSurf, dstX0, dstY0, dstX1, dstY1,
                           0.0, pFilter);
diff --git a/src/mesa/state_tracker/st_cb_fbo.c b/src/mesa/state_tracker/st_cb_fbo.c
index aec487b001b..a69f5bfd15a 100644
--- a/src/mesa/state_tracker/st_cb_fbo.c
+++ b/src/mesa/state_tracker/st_cb_fbo.c
@@ -360,7 +360,7 @@ st_render_texture(GLcontext *ctx,
 
    pipe_surface_reference(&strb->surface, NULL);
 
-   pipe_sampler_view_reference(&strb->sampler_view, st_get_stobj_sampler_view(stObj));
+   pipe_sampler_view_reference(&strb->sampler_view, st_get_texture_sampler_view(stObj));
 
    assert(strb->rtt_level <= strb->texture->last_level);
 
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 9479819e833..d12c5b6ec7a 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -838,7 +838,7 @@ decompress_with_blit(GLcontext * ctx, GLenum target, GLint level,
    struct pipe_screen *screen = pipe->screen;
    struct st_texture_image *stImage = st_texture_image(texImage);
    struct st_texture_object *stObj = st_texture_object(texObj);
-   struct pipe_sampler_view *src_view = st_get_stobj_sampler_view(stObj);
+   struct pipe_sampler_view *src_view = st_get_texture_sampler_view(stObj);
    const GLuint width = texImage->Width;
    const GLuint height = texImage->Height;
    struct pipe_surface *dst_surface;
diff --git a/src/mesa/state_tracker/st_gen_mipmap.c b/src/mesa/state_tracker/st_gen_mipmap.c
index f0fe31967c3..177a7982b35 100644
--- a/src/mesa/state_tracker/st_gen_mipmap.c
+++ b/src/mesa/state_tracker/st_gen_mipmap.c
@@ -84,7 +84,7 @@ st_render_mipmap(struct st_context *st,
 {
    struct pipe_context *pipe = st->pipe;
    struct pipe_screen *screen = pipe->screen;
-   struct pipe_sampler_view *psv = st_get_stobj_sampler_view(stObj);
+   struct pipe_sampler_view *psv = st_get_texture_sampler_view(stObj);
    const uint face = _mesa_tex_target_to_face(target);
 
    assert(target != GL_TEXTURE_3D); /* not done yet */
diff --git a/src/mesa/state_tracker/st_texture.h b/src/mesa/state_tracker/st_texture.h
index 76ea7e6950a..12ef2d7d01c 100644
--- a/src/mesa/state_tracker/st_texture.h
+++ b/src/mesa/state_tracker/st_texture.h
@@ -130,7 +130,7 @@ st_sampler_view_from_texture(struct pipe_context *pipe,
 
 
 static INLINE struct pipe_sampler_view *
-st_get_stobj_sampler_view(struct st_texture_object *stObj)
+st_get_texture_sampler_view(struct st_texture_object *stObj)
 {
    if (!stObj || !stObj->pt) {
       return NULL;
-- 
2.30.2