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 making TCS/TES/GS shaders separable by inserting gl_PerVertex

Browse Source
This commit is contained in:
baldurk
2015-01-26 19:10:00 +00:00
parent d7c8c1026c
commit 00226df891
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/gl_shader_refl.cpp
+23 -8
View File
@@ -200,7 +200,16 @@ static GLuint CreateSepProgram(const GLHookSet &gl, GLenum type, GLsizei numSour
GLuint MakeSeparableShaderProgram(const GLHookSet &gl, GLenum type, vector<string> sources, vector<string> *includepaths)
{
const string block = "\nout gl_PerVertex { vec4 gl_Position; float gl_PointSize; float gl_ClipDistance[]; };";
string block = "";
if(type == eGL_VERTEX_SHADER)
block = "\nout gl_PerVertex { vec4 gl_Position; float gl_PointSize; float gl_ClipDistance[]; };";
else if(type == eGL_TESS_CONTROL_SHADER)
block = "\nin gl_PerVertex { vec4 gl_Position; float gl_PointSize; float gl_ClipDistance[]; } gl_in[];" \
"\nout gl_PerVertex { vec4 gl_Position; float gl_PointSize; float gl_ClipDistance[]; } gl_out[];";
else
block = "\nin gl_PerVertex { vec4 gl_Position; float gl_PointSize; float gl_ClipDistance[]; } gl_in[];" \
"\nout gl_PerVertex { vec4 gl_Position; float gl_PointSize; float gl_ClipDistance[]; };";
const char **strings = new const char*[sources.size()];
for(size_t i=0; i < sources.size(); i++)
@@ -222,7 +231,8 @@ GLuint MakeSeparableShaderProgram(const GLHookSet &gl, GLenum type, vector<strin
GLint status;
gl.glGetProgramiv(sepProg, eGL_LINK_STATUS, &status);
if(status == 0 && type == eGL_VERTEX_SHADER)
// allow any vertex processing shader to redeclare gl_PerVertex
if(status == 0 && type != eGL_FRAGMENT_SHADER && type != eGL_COMPUTE_SHADER)
{
gl.glDeleteProgram(sepProg);
sepProg = 0;
@@ -272,13 +282,18 @@ GLuint MakeSeparableShaderProgram(const GLHookSet &gl, GLenum type, vector<strin
}
sepProg = CreateSepProgram(gl, type, (GLsizei)sources.size(), strings, numPaths, paths);
}
gl.glGetProgramiv(sepProg, eGL_LINK_STATUS, &status);
if(status == 0)
{
gl.glDeleteProgram(sepProg);
sepProg = 0;
}
gl.glGetProgramiv(sepProg, eGL_LINK_STATUS, &status);
if(status == 0)
{
char buffer[1025] = {0};
gl.glGetProgramInfoLog(sepProg, 1024, NULL, buffer);
RDCERR("Couldn't make separable shader program for shader. Errors:\n%s", buffer);
gl.glDeleteProgram(sepProg);
sepProg = 0;
}
delete[] strings;