st/mesa: s/st_get_stobj_sampler_view/st_get_texture_sampler_view/

This commit is contained in:
Brian Paul
2010-04-18 17:12:39 -06:00
parent ec719ae199
commit 8a7ea577ac
6 changed files with 6 additions and 6 deletions

View File

@@ -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);
}
/*

View File

@@ -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);

View File

@@ -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);

View File

@@ -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;

View File

@@ -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 */

View File

@@ -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;