qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-22 20:41:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

[glsl] Put #line after any #version lines in the chunks

Browse source 
The GLSL compiler requires any #version lines to be the first (real)
line of the program, even #line causes an error, so if the first line of
the chunk starts with #version, insert the #line directive as the second
line.
This commit is contained in:
Bill Currie 2022-03-25 01:17:12 +09:00
parent 00362e9f4e
commit e263521330
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libs/video/renderer/glsl/glsl_shader.c
View file

@ -129,8 +129,17 @@ GLSL_BuildShader (const char **effect_keys)
Sys_Printf ("Unknown shader key: '%s'\n", dot);
goto error;
}
shader->strings[num] = nva ("#line %d\n%s", chunk->start_line,
chunk->text);
if (strncmp ("#version ", chunk->text, 9) == 0) {
const char *eol = strchr (chunk->text, '\n');
int vline_len = eol ? eol - chunk->text + 1 : 0;
shader->strings[num] = nva ("%.*s#line %d\n%s", vline_len,
chunk->text,
chunk->start_line + 1,
chunk->text + vline_len);
} else {
shader->strings[num] = nva ("#line %d\n%s", chunk->start_line,
chunk->text);
}
shader->src[num] = strdup (ekey->str);
}
dstring_delete (ekey);