Module: Mesa Branch: master Commit: 9675fb6c681bf3441ee1d25e18b38faea5144524 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9675fb6c681bf3441ee1d25e18b38faea5144524
Author: Brian Paul <[email protected]> Date: Thu Feb 11 08:16:30 2016 -0700 mesa: move _mesa_num_tex_faces() to teximage.h So it's near the other cube map helper functions. Reviewed-by: Roland Scheidegger <[email protected]> Reviewed-by: Timothy Arceri <[email protected]> --- src/mesa/main/teximage.h | 19 +++++++++++++++++++ src/mesa/main/texobj.h | 19 ------------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h index 7754a97..a7e54f7 100644 --- a/src/mesa/main/teximage.h +++ b/src/mesa/main/teximage.h @@ -49,6 +49,25 @@ _mesa_is_cube_face(GLenum target) /** + * Return number of faces for a texture target. This will be 6 for + * cube maps and 1 otherwise. + * NOTE: this function is not used for cube map arrays which operate + * more like 2D arrays than cube maps. + */ +static inline GLuint +_mesa_num_tex_faces(GLenum target) +{ + switch (target) { + case GL_TEXTURE_CUBE_MAP: + case GL_PROXY_TEXTURE_CUBE_MAP: + return 6; + default: + return 1; + } +} + + +/** * If the target is GL_TEXTURE_CUBE_MAP, return one of the * GL_TEXTURE_CUBE_MAP_POSITIVE/NEGATIVE_X/Y/Z targets corresponding to * the face parameter. diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h index 8421337..378d87a 100644 --- a/src/mesa/main/texobj.h +++ b/src/mesa/main/texobj.h @@ -120,25 +120,6 @@ _mesa_unlock_texture(struct gl_context *ctx, struct gl_texture_object *texObj) } -/** - * Return number of faces for a texture target. This will be 6 for - * cube maps (and cube map arrays) and 1 otherwise. - * NOTE: this function is not used for cube map arrays which operate - * more like 2D arrays than cube maps. - */ -static inline GLuint -_mesa_num_tex_faces(GLenum target) -{ - switch (target) { - case GL_TEXTURE_CUBE_MAP: - case GL_PROXY_TEXTURE_CUBE_MAP: - return 6; - default: - return 1; - } -} - - /** Is the texture "complete" with respect to the given sampler state? */ static inline GLboolean _mesa_is_texture_complete(const struct gl_texture_object *texObj, _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
