summaryrefslogtreecommitdiff
path: root/main.cpp
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2010-06-21 11:43:42 -0700
committerKenneth Graunke <kenneth@whitecape.org>2010-06-21 12:41:05 -0700
commit4a2bbdacfc29460de09e5f806fcc96040ad17dc4 (patch)
tree9cdada229c0a4770457703740010a251a4d4ae76 /main.cpp
parent26e761edb26322eab497e884fcf7ae35fb3fd3e5 (diff)
Use yy_scan_string and stop caring about shader->SourceLen.
We had to call strlen on the preprocessed source, which seemed a bit pointless; also, we updated shader->SourceLen but not shader->Source, which was even more confusing. Just leave both untouched.
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/main.cpp b/main.cpp
index 58657fe201..25904380c9 100644
--- a/main.cpp
+++ b/main.cpp
@@ -128,10 +128,10 @@ compile_shader(struct glsl_shader *shader)
* should probably be the parser context, but there isn't one yet.
*/
const char *source = shader->Source;
- state.error = preprocess(shader, &source, &shader->SourceLen);
+ state.error = preprocess(shader, &source);
if (!state.error) {
- _mesa_glsl_lexer_ctor(& state, source, shader->SourceLen);
+ _mesa_glsl_lexer_ctor(& state, source);
_mesa_glsl_parse(& state);
_mesa_glsl_lexer_dtor(& state);
}