mesa: make _mesa_tex_target_to_face() an inline function

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
This commit is contained in:
Brian Paul 2016-02-11 07:54:27 -07:00
parent 6a08673c5e
commit d73f5a3133
2 changed files with 15 additions and 17 deletions

View File

@ -116,20 +116,6 @@ adjust_for_oes_float_texture(GLenum format, GLenum type)
return format;
}
/**
* For cube map faces, return a face index in [0,5].
* For other targets return 0;
*/
GLuint
_mesa_tex_target_to_face(GLenum target)
{
if (_mesa_is_cube_face(target))
return (GLuint) target - (GLuint) GL_TEXTURE_CUBE_MAP_POSITIVE_X;
else
return 0;
}
/**
* Install gl_texture_image in a gl_texture_object according to the target

View File

@ -47,6 +47,21 @@ _mesa_is_cube_face(GLenum target)
target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z);
}
/**
* For cube map faces, return a face index in [0,5].
* For other targets return 0;
*/
static inline GLuint
_mesa_tex_target_to_face(GLenum target)
{
if (_mesa_is_cube_face(target))
return (GLuint) target - (GLuint) GL_TEXTURE_CUBE_MAP_POSITIVE_X;
else
return 0;
}
/** Are any of the dimensions of given texture equal to zero? */
static inline GLboolean
_mesa_is_zero_size_texture(const struct gl_texture_image *texImage)
@ -131,9 +146,6 @@ extern GLboolean
_mesa_target_can_be_compressed(const struct gl_context *ctx, GLenum target,
GLenum intFormat, GLenum *error);
extern GLuint
_mesa_tex_target_to_face(GLenum target);
extern GLint
_mesa_get_texture_dimensions(GLenum target);