ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added #stk_include directive for our shaders.

Browse Source 
OpenGL ES doesn't allow to link multiple shaders into one program. We can just join it on our side and compile it as one file instead.
This commit is contained in:
Deve
2016-06-26 16:05:05 +02:00
parent 9ce190f704
commit e46905b106
1 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/graphics/shader.cpp
View File

@@ -114,11 +114,58 @@ GLuint ShaderBase::loadShader(const std::string &file, unsigned type)
{
std::string Line = "";
while (getline(stream, Line))
code << "\n" << Line;
{
const std::string stk_include = "#stk_include";
int pos = Line.find(stk_include);
if (pos != std::string::npos)
{
int pos = Line.find("\"");
if (pos == std::string::npos)
{
Log::error("shader", "Invalid #stk_include line: '%s'.", Line.c_str());
continue;
}
std::string filename = Line.substr(pos+1);
pos = filename.find("\"");
if (pos == std::string::npos)
{
Log::error("shader", "Invalid #stk_include line: '%s'.", Line.c_str());
continue;
}
filename = filename.substr(0, pos);
printf("%s\n", filename.c_str());
std::ifstream include_stream(file_manager->getShader(filename), std::ios::in);
if (!include_stream.is_open())
{
Log::error("shader", "Couldn't open included shader: '%s'.", filename.c_str());
continue;
}
std::string include_line = "";
while (getline(include_stream, include_line))
{
code << "\n" << include_line;
}
include_stream.close();
}
else
{
code << "\n" << Line;
}
}
stream.close();
}
else
{
Log::error("shader", "Can not open '%s'.", file.c_str());
}
Log::info("shader", "Compiling shader : %s", file.c_str());
const std::string &source = code.str();