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

When applying TF varyings workaround, handle matrix variables with :row

Browse Source 
* The vertex output signature is split into vectors only, so we need to
  go back to the base matrix name.
This commit is contained in:
baldurk
2017-09-11 13:56:12 +01:00
parent 08aa7399cd
commit a19cc17bdd
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/gl_manager.cpp
+23 -4
View File
@@ -24,6 +24,7 @@
******************************************************************************/
#include "driver/gl/gl_manager.h"
#include <algorithm>
#include "driver/gl/gl_driver.h"
struct VertexAttribInitialData
@@ -1074,7 +1075,7 @@ bool GLResourceManager::Serialise_InitialState(ResourceId resid, GLResource res)
GLuint initProg = gl.glCreateProgram();
std::vector<const char *> vertexOutputs;
std::vector<std::string> vertexOutputs;
for(size_t i = 0; i < details.shaders.size(); i++)
{
const auto &shadDetails = m_GL->m_Shaders[details.shaders[i]];
@@ -1084,7 +1085,20 @@ bool GLResourceManager::Serialise_InitialState(ResourceId resid, GLResource res)
if(shadDetails.type == eGL_VERTEX_SHADER)
{
for(int s = 0; s < shadDetails.reflection.OutputSig.count; s++)
vertexOutputs.push_back(shadDetails.reflection.OutputSig[s].varName.c_str());
{
std::string name = shadDetails.reflection.OutputSig[s].varName.c_str();
// look for :row added to split up matrix variables
size_t colon = name.find(":row");
// remove it, if present
if(colon != std::string::npos)
name.resize(colon);
// only push matrix variables once
if(std::find(vertexOutputs.begin(), vertexOutputs.end(), name) == vertexOutputs.end())
vertexOutputs.push_back(name);
}
}
char **srcs = new char *[shadDetails.sources.size()];
@@ -1102,8 +1116,13 @@ bool GLResourceManager::Serialise_InitialState(ResourceId resid, GLResource res)
// This resulted in initProg locationTranslate table being -1 for a particular shader where
// some uniforms were only intended to affect TF. Therefore set a TF mode for all varyings.
// As the initial state program is never used for TF, this wont adversely affect anything.
gl.glTransformFeedbackVaryings(initProg, (GLsizei)vertexOutputs.size(), &vertexOutputs[0],
eGL_INTERLEAVED_ATTRIBS);
std::vector<const char *> vertexOutputsPtr;
vertexOutputsPtr.resize(vertexOutputs.size());
for(size_t i = 0; i < vertexOutputs.size(); i++)
vertexOutputsPtr[i] = vertexOutputs[i].c_str();
gl.glTransformFeedbackVaryings(initProg, (GLsizei)vertexOutputsPtr.size(),
&vertexOutputsPtr[0], eGL_INTERLEAVED_ATTRIBS);
gl.glLinkProgram(initProg);
GLint status = 0;