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

mesa: move _mesa_num_tex_faces() to teximage.h

Browse source 
So it's near the other cube map helper functions.

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 08:16:30 -07:00
parent 6e09df24b5
commit 9675fb6c68
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,6 +48,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 * If the target is GL_TEXTURE_CUBE_MAP, return one of the
* GL_TEXTURE_CUBE_MAP_POSITIVE/NEGATIVE_X/Y/Z targets corresponding to * GL_TEXTURE_CUBE_MAP_POSITIVE/NEGATIVE_X/Y/Z targets corresponding to

19
src/mesa/main/texobj.h
View file

@ -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? */ /** Is the texture "complete" with respect to the given sampler state? */
static inline GLboolean static inline GLboolean
_mesa_is_texture_complete(const struct gl_texture_object *texObj, _mesa_is_texture_complete(const struct gl_texture_object *texObj,