summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-06-10 12:22:36 -0600
committerBrian Paul <brianp@vmware.com>2009-06-10 12:22:36 -0600
commitdbab657fe7842c9ea5315189f31fb3c7238c0158 (patch)
treefd494e8fd868a7539c9b35b7f5b2cf5ec10064b4
parent9225b67383ee5c5b511b84838fd248b85403bd92 (diff)
glsl: fix warnings, update comments, s/TRUE/GL_TRUE/
(cherry picked from master, commit 7fdd64ab29576e607434fb8c82ddfa61e8ea6aa8)
-rw-r--r--src/mesa/shader/slang/slang_preprocess.c7
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 749bb8c0f64..e9a24cc009a 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;
}