Mesa (mesa_7_4_branch): glsl: fix warnings, update comments, s/TRUE/GL_TRUE /
Brian Paul
brianp at kemper.freedesktop.org
Wed Jun 10 18:27:01 UTC 2009
Module: Mesa
Branch: mesa_7_4_branch
Commit: 02659868e888f8575ed4a3f6f0d269a7bbe2c5c2
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=02659868e888f8575ed4a3f6f0d269a7bbe2c5c2
Author: Brian Paul <brianp at vmware.com>
Date: Wed Jun 10 12:26:12 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 6953616..e03a70f 100644
--- a/src/mesa/shader/slang/slang_preprocess.c
+++ b/src/mesa/shader/slang/slang_preprocess.c
@@ -1306,14 +1306,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)
{
@@ -1340,7 +1341,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