lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-10 03:50:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

#version technically needs to come even before #if preprocessor stmts

Browse Source
This commit is contained in:
baldurk
2015-02-08 10:34:32 +00:00
parent 24577f3612
commit c3ca815da1
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/data/glsl/debuguniforms.h
+3 -1
View File
@@ -36,7 +36,9 @@
#else
#version 420 core
// this has to happen above even any pre-processor definitions,
// so it's added in code
//#version 420 core
#define BINDING(b) layout (binding = b, std140)
renderdoc/driver/gl/gl_debug.cpp
+2 -1
View File
@@ -173,7 +173,8 @@ void GLReplay::InitDebugData()
DebugData.blitProg = CreateShaderProgram(DebugData.blitvsSource.c_str(), DebugData.blitfsSource.c_str());
string glslheader = GetEmbeddedResource(debuguniforms_h);
string glslheader = "#version 420 core\n\n";
glslheader += GetEmbeddedResource(debuguniforms_h);
string texfs = GetEmbeddedResource(texsample_h);
texfs += GetEmbeddedResource(texdisplay_frag);
renderdoc/driver/gl/gl_driver.cpp
+2 -1
View File
@@ -1117,7 +1117,8 @@ void WrappedOpenGL::ActivateContext(GLWindowingData winData)
gl.glGenBuffers(1, &ctxdata.StringUBO);
gl.glNamedBufferStorageEXT(ctxdata.StringUBO, sizeof(uint32_t)*4*FONT_MAX_CHARS, NULL, GL_MAP_WRITE_BIT);
string textvs = GetEmbeddedResource(debuguniforms_h);
string textvs = "#version 420 core\n\n";
textvs += GetEmbeddedResource(debuguniforms_h);
textvs += GetEmbeddedResource(text_vert);
string textfs = GetEmbeddedResource(text_frag);