summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorMichal Krol <[email protected]>2009-11-21 20:43:02 +0100
committerMichal Krol <[email protected]>2009-11-21 20:43:02 +0100
commit1cf021475a6628cdf4c26457bc7ca0c603fe2c7c (patch)
treedd5534fe2f50b0e84cd8b8a9f81d8d8548ad55e7 /src/mesa
parentabe1f332983e5c70d75b5ae83f06c0dfdd081a26 (diff)
slang: No need to purify source text for tokeniser.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/shader/slang/slang_compile.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/shader/slang/slang_compile.c
index 44c889734b6..f2342bfdcbe 100644
--- a/src/mesa/shader/slang/slang_compile.c
+++ b/src/mesa/shader/slang/slang_compile.c
@@ -2592,34 +2592,24 @@ compile_with_grammar(const char *source,
unsigned int maxVersion;
int result;
struct sl_pp_purify_options options;
- char *outbuf;
char errmsg[200] = "";
unsigned int errline = 0;
struct sl_pp_token_info *intokens;
unsigned int tokens_eaten;
- memset(&options, 0, sizeof(options));
- if (sl_pp_purify(source, &options, &outbuf, errmsg, sizeof(errmsg), &errline)) {
- slang_info_log_error(infolog, errmsg);
- return GL_FALSE;
- }
-
context = sl_pp_context_create();
if (!context) {
slang_info_log_error(infolog, "out of memory");
- free(outbuf);
return GL_FALSE;
}
- if (sl_pp_tokenise(context, outbuf, &intokens)) {
+ memset(&options, 0, sizeof(options));
+ if (sl_pp_tokenise(context, &options, source, &intokens)) {
slang_info_log_error(infolog, "%s", sl_pp_context_error_message(context));
sl_pp_context_destroy(context);
- free(outbuf);
return GL_FALSE;
}
- free(outbuf);
-
if (sl_pp_version(context, intokens, &version, &tokens_eaten)) {
slang_info_log_error(infolog, "%s", sl_pp_context_error_message(context));
sl_pp_context_destroy(context);