fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 18:08:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

glsl: fix preprocessor bug involving //-style comments in macro definitions

Browse source 
See comments for details.
This commit is contained in:
Brian Paul 2010-01-29 08:26:23 -07:00
parent 9fd3c74724
commit cb5447f79c
1 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/mesa/shader/slang/slang_preprocess.c
View file

@ -914,6 +914,35 @@ parse_if (slang_string *output, const byte *prod, GLuint *pi, GLint *result, pp_
#define PRAGMA_PARAM 1
/**
* Return the length of the given string, stopping at any C++-style comments.
* This step fixes bugs with macro definitions such as:
* #define PI 3.14159 // this is pi
* The preprocessor includes the comment in the definition of PI so
* when we plug in PI somewhere, we get the comment too.
* This function effectively strips of the // comment from the given string.
* It might also be possible to fix this in the preprocessor grammar.
* This bug is not present in the new Mesa 7.8 preprocessor.
*/
static int
strlen_without_comments(const char *s)
{
char pred = 0;
int len = 0;
while (*s) {
if (*s == '/' && pred == '/') {
return len - 1;
}
pred = *s;
s++;
len++;
}
return len;
}
static GLboolean
preprocess_source (slang_string *output, const char *source,
grammar pid, grammar eid,
@ -1055,11 +1084,12 @@ preprocess_source (slang_string *output, const char *source,
if (state.cond.top->effective) {
slang_string replacement;
expand_state es;
int idlen2 = strlen_without_comments((char*)id);
pp_annotate (output, ") %s", id);
slang_string_init(&replacement);
slang_string_pushs(&replacement, id, idlen);
slang_string_pushs(&replacement, id, idlen2);
/* Expand macro replacement. */
es.output = &symbol->replacement;