lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-13 21:40:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix GLSL shader editing

Browse Source 
The "files" system expects other files to be #included, which won't make
sense for GLSL sources, which are expected to be concatenated. Use the
concatenated string as a single "main.glsl" file.
This commit is contained in:
Jasper St. Pierre
2018-02-01 11:09:47 -08:00
committed by baldurk
parent 427a89db0b
commit 2dd9531199
1 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/wrappers/gl_shader_funcs.cpp
+16 -22
View File
@@ -60,28 +60,26 @@ void WrappedOpenGL::ShaderData::Compile(WrappedOpenGL &gl, ResourceId id, GLuint
if(type == eGL_VERTEX_SHADER)
CheckVertexOutputUses(sources, pointSizeUsed, clipDistanceUsed);
string concatenated;
for(size_t i = 0; i < sources.size(); i++)
{
string concatenated;
for(size_t i = 0; i < sources.size(); i++)
if(sources.size() > 1)
{
if(sources.size() > 1)
{
if(i > 0)
concatenated += "\n";
concatenated += "/////////////////////////////";
concatenated += StringFormat::Fmt("// Source file %u", (uint32_t)i);
concatenated += "/////////////////////////////";
if(i > 0)
concatenated += "\n";
}
concatenated += sources[i];
concatenated += "/////////////////////////////";
concatenated += StringFormat::Fmt("// Source file %u", (uint32_t)i);
concatenated += "/////////////////////////////";
concatenated += "\n";
}
reflection.encoding = ShaderEncoding::GLSL;
reflection.rawBytes.assign((byte *)concatenated.c_str(), concatenated.size());
concatenated += sources[i];
}
reflection.encoding = ShaderEncoding::GLSL;
reflection.rawBytes.assign((byte *)concatenated.c_str(), concatenated.size());
GLuint sepProg = prog;
GLint status = 0;
@@ -123,13 +121,9 @@ void WrappedOpenGL::ShaderData::Compile(WrappedOpenGL &gl, ResourceId id, GLuint
reflection.stage = MakeShaderStage(type);
// TODO sort these so that the first file contains the entry point
reflection.debugInfo.files.resize(sources.size());
for(size_t i = 0; i < sources.size(); i++)
{
reflection.debugInfo.files[i].filename = StringFormat::Fmt("source%u.glsl", (uint32_t)i);
reflection.debugInfo.files[i].contents = sources[i];
}
reflection.debugInfo.files.resize(1);
reflection.debugInfo.files[0].filename = "main.glsl";
reflection.debugInfo.files[0].contents = concatenated;
}
}