lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 01:50:38 +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 c87dfebd2e
commit 022d46ab7d
1 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/wrappers/gl_shader_funcs.cpp
+15 -21
View File
@@ -35,27 +35,25 @@ void WrappedOpenGL::ShaderData::Compile(WrappedOpenGL &gl, ResourceId id)
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";
}
create_array_init(reflection.RawBytes, concatenated.size(), (byte *)concatenated.c_str());
concatenated += sources[i];
}
create_array_init(reflection.RawBytes, concatenated.size(), (byte *)concatenated.c_str());
GLuint sepProg = prog;
if(sepProg == 0)
@@ -85,13 +83,9 @@ void WrappedOpenGL::ShaderData::Compile(WrappedOpenGL &gl, ResourceId id)
reflection.ID = id;
reflection.EntryPoint = "main";
// TODO sort these so that the first file contains the entry point
create_array_uninit(reflection.DebugInfo.files, sources.size());
for(size_t i = 0; i < sources.size(); i++)
{
reflection.DebugInfo.files[i].first = StringFormat::Fmt("source%u.glsl", (uint32_t)i);
reflection.DebugInfo.files[i].second = sources[i];
}
create_array_uninit(reflection.DebugInfo.files, 1);
reflection.DebugInfo.files[0].first = "main.glsl";
reflection.DebugInfo.files[0].second = concatenated;
}
}