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

Handle other object label types, and negative message lengths

Browse Source 
* If a message length is set to a negative value, the message should be
  treated as null terminated
This commit is contained in:
baldurk
2014-12-02 00:50:32 +00:00
parent 6e213a71a7
commit ed7b394a57
1 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/wrappers/gl_debug_funcs.cpp
+29 -2
View File
@@ -47,6 +47,33 @@ bool WrappedOpenGL::Serialise_glObjectLabel(GLenum identifier, GLuint name, GLsi
case eGL_BUFFER:
liveid = GetResourceManager()->GetID(BufferRes(GetCtx(), name));
break;
case eGL_PROGRAM:
liveid = GetResourceManager()->GetID(ProgramRes(GetCtx(), name));
break;
case eGL_PROGRAM_PIPELINE:
liveid = GetResourceManager()->GetID(ProgramPipeRes(GetCtx(), name));
break;
case eGL_VERTEX_ARRAY:
liveid = GetResourceManager()->GetID(VertexArrayRes(GetCtx(), name));
break;
case GL_SHADER:
liveid = GetResourceManager()->GetID(ShaderRes(GetCtx(), name));
break;
case GL_QUERY:
liveid = GetResourceManager()->GetID(QueryRes(GetCtx(), name));
break;
case GL_TRANSFORM_FEEDBACK:
liveid = GetResourceManager()->GetID(FeedbackRes(GetCtx(), name));
break;
case GL_SAMPLER:
liveid = GetResourceManager()->GetID(SamplerRes(GetCtx(), name));
break;
case GL_RENDERBUFFER:
liveid = GetResourceManager()->GetID(RenderbufferRes(GetCtx(), name));
break;
case GL_FRAMEBUFFER:
liveid = GetResourceManager()->GetID(FramebufferRes(GetCtx(), name));
break;
default:
RDCERR("Unhandled namespace in glObjectLabel");
}
@@ -111,7 +138,7 @@ void WrappedOpenGL::glDebugMessageControl(GLenum source, GLenum type, GLenum sev
bool WrappedOpenGL::Serialise_glDebugMessageInsert(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf)
{
string name = buf ? string(buf, buf+length) : "";
string name = buf ? string(buf, buf + (length > 0 ? length : strlen(buf))) : "";
m_pSerialiser->Serialise("Name", name);
@@ -142,7 +169,7 @@ void WrappedOpenGL::glDebugMessageInsert(GLenum source, GLenum type, GLuint id,
bool WrappedOpenGL::Serialise_glPushDebugGroup(GLenum source, GLuint id, GLsizei length, const GLchar *message)
{
string name = message ? string(message, message+length) : "";
string name = message ? string(message, message + (length > 0 ? length : strlen(message))) : "";
m_pSerialiser->Serialise("Name", name);