Mesa (master): glsl: fix implicit int to bool warning

Brian Paul brianp at kemper.freedesktop.org
Sat Jan 15 00:47:06 UTC 2011


Module: Mesa
Branch: master
Commit: d42acef139740a54fe571f99b62cba7720734d8c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d42acef139740a54fe571f99b62cba7720734d8c

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Jan 14 17:45:23 2011 -0700

glsl: fix implicit int to bool warning

Maybe preprocess() should return a bool.

---

 src/glsl/main.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/glsl/main.cpp b/src/glsl/main.cpp
index 847540d..2d146ca 100644
--- a/src/glsl/main.cpp
+++ b/src/glsl/main.cpp
@@ -185,7 +185,7 @@ compile_shader(struct gl_context *ctx, struct gl_shader *shader)
 
    const char *source = shader->Source;
    state->error = preprocess(state, &source, &state->info_log,
-			     state->extensions, ctx->API);
+			     state->extensions, ctx->API) != 0;
 
    if (!state->error) {
       _mesa_glsl_lexer_ctor(state, source);




More information about the mesa-commit mailing list