brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move _cogl_texture_2d_is_pot to cogl-util.h

Browse Source 
This function could be used in many places in Cogl so it makes sense
to share it in cogl-util.h as _cogl_util_is_pot().
This commit is contained in:
Neil Roberts 2010-07-01 11:07:03 +01:00
parent 31c127bfa7
commit 423f712871
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clutter/cogl/cogl/cogl-texture-2d.c
View File

@ -158,13 +158,6 @@ _cogl_texture_2d_free (CoglTexture2D *tex_2d)
_cogl_texture_free (COGL_TEXTURE (tex_2d)); _cogl_texture_free (COGL_TEXTURE (tex_2d));
} }
static gboolean
_cogl_texture_2d_is_pot (unsigned int num)
{
/* Make sure there is only one bit set */
return (num & (num - 1)) == 0;
}
static gboolean static gboolean
_cogl_texture_2d_can_create (unsigned int width, _cogl_texture_2d_can_create (unsigned int width,
unsigned int height, unsigned int height,
@ -183,8 +176,8 @@ _cogl_texture_2d_can_create (unsigned int width,
/* If NPOT textures aren't supported then the size must be a power /* If NPOT textures aren't supported then the size must be a power
of two */ of two */
if (!cogl_features_available (COGL_FEATURE_TEXTURE_NPOT) && if (!cogl_features_available (COGL_FEATURE_TEXTURE_NPOT) &&
(!_cogl_texture_2d_is_pot (width) || (!_cogl_util_is_pot (width) ||
!_cogl_texture_2d_is_pot (height))) !_cogl_util_is_pot (height)))
return FALSE; return FALSE;
_cogl_pixel_format_to_gl (internal_format, _cogl_pixel_format_to_gl (internal_format,

8
clutter/cogl/cogl/cogl-util.h
View File

@ -60,4 +60,12 @@ cogl_util_float_signbit (float x)
negative numbers. */ negative numbers. */
#define COGL_UTIL_NEARBYINT(x) ((int) ((x) < 0.0f ? (x) - 0.5f : (x) + 0.5f)) #define COGL_UTIL_NEARBYINT(x) ((int) ((x) < 0.0f ? (x) - 0.5f : (x) + 0.5f))
/* Returns whether the given integer is a power of two */
static inline gboolean
_cogl_util_is_pot (unsigned int num)
{
/* Make sure there is only one bit set */
return (num & (num - 1)) == 0;
}
#endif /* __COGL_UTIL_H */ #endif /* __COGL_UTIL_H */