Skip to content
Snippets Groups Projects
Commit 0c70ca90 authored by Hannu Hanhi's avatar Hannu Hanhi
Browse files

Add support for mixed line endings to the shader preprocessor

Fixes CurveV3.pk3
parent 0894547d
No related branches found
No related tags found
2 merge requests!2355fix newer versions of mixerx,!1516OpenGL palette rendering and related things
...@@ -426,15 +426,18 @@ static char *HWR_PreprocessShader(char *original) ...@@ -426,15 +426,18 @@ static char *HWR_PreprocessShader(char *original)
if (strstr(original, "\r\n")) if (strstr(original, "\r\n"))
{ {
line_ending = "\r\n"; line_ending = "\r\n";
// check that all line endings are same, // check if all line endings are same
// otherwise the parsing code won't function correctly
while ((read_pos = strchr(read_pos, '\n'))) while ((read_pos = strchr(read_pos, '\n')))
{ {
read_pos--; read_pos--;
if (*read_pos != '\r') if (*read_pos != '\r')
{ {
CONS_Alert(CONS_ERROR, "HWR_PreprocessShader: Shader contains mixed line ending types. Please use either only LF (Unix) or only CRLF (Windows) line endings.\n"); // this file contains mixed CRLF and LF line endings.
return NULL; // treating it as a LF file during parsing should keep
// the results sane enough as long as the gpu driver is fine
// with these kinds of weirdly formatted shader sources.
line_ending = "\n";
break;
} }
read_pos += 2; read_pos += 2;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment