mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-28 21:39:48 +00:00
Code Issues Releases Wiki Activity

ShaderManager: insert #line directives when including files

Browse source
This commit is contained in:
scrawl 2016-02-20 19:26:59 +01:00
parent f01e8a6950
commit 171e293641
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
components/shader/shadermanager.cpp
View file

@ -2,12 +2,14 @@
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
#include <algorithm>
#include <osg/Program> #include <osg/Program>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <boost/filesystem/path.hpp> #include <boost/filesystem/path.hpp>
#include <boost/filesystem/fstream.hpp> #include <boost/filesystem/fstream.hpp>
#include <boost/algorithm/string.hpp>
#include <OpenThreads/ScopedLock> #include <OpenThreads/ScopedLock>
@ -21,8 +23,11 @@ namespace Shader
bool parseIncludes(boost::filesystem::path shaderPath, std::string& source) bool parseIncludes(boost::filesystem::path shaderPath, std::string& source)
{ {
boost::replace_all(source, "\r\n", "\n");
std::set<boost::filesystem::path> includedFiles; std::set<boost::filesystem::path> includedFiles;
size_t foundPos = 0; size_t foundPos = 0;
int fileNumber = 1;
while ((foundPos = source.find("#include")) != std::string::npos) while ((foundPos = source.find("#include")) != std::string::npos)
{ {
size_t start = source.find('"', foundPos); size_t start = source.find('"', foundPos);
@ -46,9 +51,19 @@ namespace Shader
std::cerr << "Failed to open " << includePath.string() << std::endl; std::cerr << "Failed to open " << includePath.string() << std::endl;
return false; return false;
} }
std::stringstream buffer; std::stringstream buffer;
buffer << includeFstream.rdbuf(); buffer << includeFstream.rdbuf();
source.replace(foundPos, (end-foundPos+1), buffer.str());
// insert #line directives so we get correct line numbers in compiler errors
int includedFileNumber = fileNumber++;
int lineNumber = std::count(source.begin(), source.begin() + foundPos, '\n');
std::stringstream toInsert;
toInsert << "#line 0 " << includedFileNumber << "\n" << buffer.str() << "\n#line " << lineNumber << " 0\n";
source.replace(foundPos, (end-foundPos+1), toInsert.str());
if (includedFiles.insert(includePath).second == false) if (includedFiles.insert(includePath).second == false)
{ {