diff options
| author | Brian Paul <brianp@vmware.com> | 2010-04-18 17:58:44 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-04-18 18:02:42 -0600 |
| commit | c3016dcee562953dc187b484a27203c735f9662b (patch) | |
| tree | 76b1f4537e280f342e54d32d64c6c28d8de9270c | |
| parent | 5d3d63d45a037fdf603ddcff88da635c3ce8075e (diff) | |
st/mesa: s/st_get_texobj_texture/st_get_texobj_resource/
| -rw-r--r-- | src/mesa/state_tracker/st_cb_fbo.c | 2 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_gen_mipmap.c | 4 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_texture.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/state_tracker/st_cb_fbo.c b/src/mesa/state_tracker/st_cb_fbo.c index e13bc1921a..de1b8e7dc0 100644 --- a/src/mesa/state_tracker/st_cb_fbo.c +++ b/src/mesa/state_tracker/st_cb_fbo.c @@ -315,7 +315,7 @@ st_render_texture(GLcontext *ctx, struct pipe_screen *screen = ctx->st->pipe->screen; struct st_renderbuffer *strb; struct gl_renderbuffer *rb; - struct pipe_resource *pt = st_get_texobj_texture(att->Texture); + struct pipe_resource *pt = st_get_texobj_resource(att->Texture); struct st_texture_object *stObj; const struct gl_texture_image *texImage; GLint pt_level; diff --git a/src/mesa/state_tracker/st_gen_mipmap.c b/src/mesa/state_tracker/st_gen_mipmap.c index f25b5bf028..5b7a962037 100644 --- a/src/mesa/state_tracker/st_gen_mipmap.c +++ b/src/mesa/state_tracker/st_gen_mipmap.c @@ -107,7 +107,7 @@ fallback_generate_mipmap(GLcontext *ctx, GLenum target, struct gl_texture_object *texObj) { struct pipe_context *pipe = ctx->st->pipe; - struct pipe_resource *pt = st_get_texobj_texture(texObj); + struct pipe_resource *pt = st_get_texobj_resource(texObj); const uint baseLevel = texObj->BaseLevel; const uint lastLevel = pt->last_level; const uint face = _mesa_tex_target_to_face(target), zslice = 0; @@ -213,7 +213,7 @@ st_generate_mipmap(GLcontext *ctx, GLenum target, { struct st_context *st = ctx->st; struct st_texture_object *stObj = st_texture_object(texObj); - struct pipe_resource *pt = st_get_texobj_texture(texObj); + struct pipe_resource *pt = st_get_texobj_resource(texObj); const uint baseLevel = texObj->BaseLevel; uint lastLevel; uint dstLevel; diff --git a/src/mesa/state_tracker/st_texture.h b/src/mesa/state_tracker/st_texture.h index d1a430bc97..5771572ad9 100644 --- a/src/mesa/state_tracker/st_texture.h +++ b/src/mesa/state_tracker/st_texture.h @@ -99,7 +99,7 @@ st_texture_object(struct gl_texture_object *obj) static INLINE struct pipe_resource * -st_get_texobj_texture(struct gl_texture_object *texObj) +st_get_texobj_resource(struct gl_texture_object *texObj) { struct st_texture_object *stObj = st_texture_object(texObj); return stObj ? stObj->pt : NULL; |