Merge branch 'shader_line_numbering' into 'master'

Correctly resetting line numbering during shader processing.

See merge request OpenMW/openmw!317
pull/593/head
psi29a 4 years ago
commit bca698d951

@ -92,7 +92,7 @@ namespace
"\n" "\n"
"void bar() { foo() }\n" "void bar() { foo() }\n"
"\n" "\n"
"#line 2 0\n" "#line 1 0\n"
"\n" "\n"
"void main() { bar() }\n"; "void main() { bar() }\n";
EXPECT_EQ(shader->getShaderSource(), expected); EXPECT_EQ(shader->getShaderSource(), expected);

@ -106,7 +106,7 @@ namespace Shader
else else
{ {
lineDirectivePosition = 0; lineDirectivePosition = 0;
lineNumber = 1; lineNumber = 0;
} }
lineNumber += std::count(source.begin() + lineDirectivePosition, source.begin() + foundPos, '\n'); lineNumber += std::count(source.begin() + lineDirectivePosition, source.begin() + foundPos, '\n');

Loading…
Cancel
Save