Mesa (master): glsl: fix warnings, update comments, s/TRUE/GL_TRUE/

Jose Fonseca jrfonseca at kemper.freedesktop.org
Thu Jun 11 15:35:49 UTC 2009


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

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jun 10 12:22:36 2009 -0600

glsl: fix warnings, update comments, s/TRUE/GL_TRUE/

(cherry picked from master, commit 7fdd64ab29576e607434fb8c82ddfa61e8ea6aa8)

---

 src/mesa/shader/slang/slang_preprocess.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/mesa/shader/slang/slang_preprocess.c b/src/mesa/shader/slang/slang_preprocess.c
index 749bb8c..e9a24cc 100644
--- a/src/mesa/shader/slang/slang_preprocess.c
+++ b/src/mesa/shader/slang/slang_preprocess.c
@@ -1300,14 +1300,15 @@ error:
 }
 
 
-/*
+/**
  * Remove the continuation characters from the input string.
  * This is the very first step in preprocessing and is effective
  * even inside comment blocks.
  * If there is a whitespace between a backslash and a newline,
  * this is not considered as a line continuation.
+ * \return GL_TRUE for success, GL_FALSE otherwise.
  */
-GLboolean
+static GLboolean
 _slang_preprocess_backslashes(slang_string *output,
                               const char *input)
 {
@@ -1334,7 +1335,7 @@ _slang_preprocess_backslashes(slang_string *output,
          slang_string_pushc(output, *input++);
       }
    }
-   return TRUE;
+   return GL_TRUE;
 }
 
 




More information about the mesa-commit mailing list