fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 13:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: remove unused _mesa_select_tex_object() function

Browse source 
The _mesa_get_current_tex_object() function is now used everywhere that
_mesa_select_tex_object() was formerly used.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Brian Paul 2014-01-27 12:10:41 -07:00
parent d5df28381e
commit 9eaed3eb6e
2 changed files with 6 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/mesa/main/teximage.c
View file

@ -737,20 +737,14 @@ _mesa_get_proxy_target(GLenum target)
/**
* Get the texture object that corresponds to the target of the given
* texture unit. The target should have already been checked for validity.
*
* \param ctx GL context.
* \param texUnit texture unit.
* \param target texture target.
*
* \return pointer to the texture object on success, or NULL on failure.
* Return a pointer to the current texture object for the given target
* on the current texture unit.
* Note: all <target> error checking should have been done by this point.
*/
struct gl_texture_object *
_mesa_select_tex_object(struct gl_context *ctx,
const struct gl_texture_unit *texUnit,
GLenum target)
_mesa_get_current_tex_object(struct gl_context *ctx, GLenum target)
{
struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx);
const GLboolean arrayTex = ctx->Extensions.EXT_texture_array;
switch (target) {
@ -818,22 +812,12 @@ _mesa_select_tex_object(struct gl_context *ctx,
return ctx->Extensions.ARB_texture_multisample
? ctx->Texture.ProxyTex[TEXTURE_2D_MULTISAMPLE_ARRAY_INDEX] : NULL;
default:
_mesa_problem(NULL, "bad target in _mesa_select_tex_object()");
_mesa_problem(NULL, "bad target in _mesa_get_current_tex_object()");
return NULL;
}
}
/**
* Return pointer to texture object for given target on current texture unit.
*/
struct gl_texture_object *
_mesa_get_current_tex_object(struct gl_context *ctx, GLenum target)
{
struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx);
return _mesa_select_tex_object(ctx, texUnit, target);
}
/**
* Get a texture image pointer from a texture object, given a texture

5
src/mesa/main/teximage.h
View file

@ -102,11 +102,6 @@ _mesa_clear_texture_image(struct gl_context *ctx,
struct gl_texture_image *texImage);
extern struct gl_texture_object *
_mesa_select_tex_object(struct gl_context *ctx,
const struct gl_texture_unit *texUnit,
GLenum target);
extern struct gl_texture_object *
_mesa_get_current_tex_object(struct gl_context *ctx, GLenum target);