[Mesa-dev] [PATCH 04/11] meta: Replace GLboolean with bool in fallback_required().
Kenneth Graunke
kenneth at whitecape.org
Thu Mar 6 02:47:20 PST 2014
This doesn't interact with the GL API, so we shouldn't use GL types.
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/mesa/drivers/common/meta_generate_mipmap.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/mesa/drivers/common/meta_generate_mipmap.c b/src/mesa/drivers/common/meta_generate_mipmap.c
index 205c5e4..6db3f8f 100644
--- a/src/mesa/drivers/common/meta_generate_mipmap.c
+++ b/src/mesa/drivers/common/meta_generate_mipmap.c
@@ -50,7 +50,7 @@
* images are mapped.
* \return GL_TRUE if a fallback is needed, GL_FALSE otherwise
*/
-static GLboolean
+static bool
fallback_required(struct gl_context *ctx, GLenum target,
struct gl_texture_object *texObj)
{
@@ -67,7 +67,7 @@ fallback_required(struct gl_context *ctx, GLenum target,
_mesa_perf_debug(ctx, MESA_DEBUG_SEVERITY_HIGH,
"glGenerateMipmap() to %s target\n",
_mesa_lookup_enum_by_nr(target));
- return GL_TRUE;
+ return true;
}
srcLevel = texObj->BaseLevel;
@@ -75,14 +75,14 @@ fallback_required(struct gl_context *ctx, GLenum target,
if (!baseImage) {
_mesa_perf_debug(ctx, MESA_DEBUG_SEVERITY_HIGH,
"glGenerateMipmap() couldn't find base teximage\n");
- return GL_TRUE;
+ return true;
}
if (_mesa_is_format_compressed(baseImage->TexFormat)) {
_mesa_perf_debug(ctx, MESA_DEBUG_SEVERITY_HIGH,
"glGenerateMipmap() with %s format\n",
_mesa_get_format_name(baseImage->TexFormat));
- return GL_TRUE;
+ return true;
}
if (_mesa_get_format_color_encoding(baseImage->TexFormat) == GL_SRGB &&
@@ -94,7 +94,7 @@ fallback_required(struct gl_context *ctx, GLenum target,
_mesa_perf_debug(ctx, MESA_DEBUG_SEVERITY_HIGH,
"glGenerateMipmap() of sRGB texture without "
"sRGB decode\n");
- return GL_TRUE;
+ return true;
}
/*
@@ -132,10 +132,10 @@ fallback_required(struct gl_context *ctx, GLenum target,
if (status != GL_FRAMEBUFFER_COMPLETE_EXT) {
_mesa_perf_debug(ctx, MESA_DEBUG_SEVERITY_HIGH,
"glGenerateMipmap() got incomplete FBO\n");
- return GL_TRUE;
+ return true;
}
- return GL_FALSE;
+ return false;
}
void
--
1.9.0
More information about the mesa-dev
mailing list