mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-19 03:39:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'shader_line_numbering' into 'master'

Browse Source 
Correctly resetting line numbering during shader processing.

See merge request OpenMW/openmw!317
This commit is contained in:
psi29a 2020-10-07 07:16:45 +00:00
commit bca698d951
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw_test_suite/shader/shadermanager.cpp
View File

@ -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);

2
components/shader/shadermanager.cpp
View File

@ -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');