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

Handle no VAO being bound without crashing

Browse Source 
* Binding VAO 0 is invalid in core GL, but it's common for programs to do
  so we want to support it - we can show an API error/warning to indicate
  that it's wrong.
This commit is contained in:
baldurk
2014-12-21 16:58:10 +00:00
parent 924270b3b0
commit 741e7ab60c
2 changed files with 42 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp
+21 -18
View File
@@ -102,7 +102,7 @@ bool WrappedOpenGL::Serialise_glBindBuffer(GLenum target, GLuint buffer)
// if we're just reading, make sure not to trample state (e.g. element array buffer
// binding in a VAO), since this is just a bind-to-create chunk.
GLuint prevbuf = 0;
if(m_State == READING && m_CurEventID == 0)
if(m_State == READING && m_CurEventID == 0)
m_Real.glGetIntegerv(BufferBinding(Target), (GLint *)&prevbuf);
GLResource res = GetResourceManager()->GetLiveResource(Id);
@@ -110,7 +110,7 @@ bool WrappedOpenGL::Serialise_glBindBuffer(GLenum target, GLuint buffer)
m_Buffers[GetResourceManager()->GetLiveID(Id)].curType = Target;
if(m_State == READING && m_CurEventID == 0)
if(m_State == READING && m_CurEventID == 0)
m_Real.glBindBuffer(Target, prevbuf);
}
}
@@ -2121,7 +2121,8 @@ void WrappedOpenGL::glVertexAttribPointer(GLuint index, GLint size, GLenum type,
{
SCOPED_SERIALISE_CONTEXT(VERTEXATTRIBPOINTER);
Serialise_glVertexArrayVertexAttribOffsetEXT(varecord->Resource.name, bufrecord->Resource.name, index, size, type, normalized, stride, (GLintptr)pointer);
Serialise_glVertexArrayVertexAttribOffsetEXT(varecord ? varecord->Resource.name : 0, bufrecord ? bufrecord->Resource.name : 0,
index, size, type, normalized, stride, (GLintptr)pointer);
r->AddChunk(scope.Get());
}
@@ -2215,7 +2216,8 @@ void WrappedOpenGL::glVertexAttribIPointer(GLuint index, GLint size, GLenum type
{
SCOPED_SERIALISE_CONTEXT(VERTEXATTRIBIPOINTER);
Serialise_glVertexArrayVertexAttribIOffsetEXT(varecord->Resource.name, bufrecord->Resource.name, index, size, type, stride, (GLintptr)pointer);
Serialise_glVertexArrayVertexAttribIOffsetEXT(varecord ? varecord->Resource.name : 0, bufrecord ? bufrecord->Resource.name : 0,
index, size, type, stride, (GLintptr)pointer);
r->AddChunk(scope.Get());
}
@@ -2309,7 +2311,8 @@ void WrappedOpenGL::glVertexAttribLPointer(GLuint index, GLint size, GLenum type
{
SCOPED_SERIALISE_CONTEXT(VERTEXATTRIBLPOINTER);
Serialise_glVertexArrayVertexAttribLOffsetEXT(varecord->Resource.name, bufrecord->Resource.name, index, size, type, stride, (GLintptr)pointer);
Serialise_glVertexArrayVertexAttribLOffsetEXT(varecord ? varecord->Resource.name : 0, bufrecord ? bufrecord->Resource.name : 0,
index, size, type, stride, (GLintptr)pointer);
r->AddChunk(scope.Get());
}
@@ -2351,7 +2354,7 @@ void WrappedOpenGL::glVertexArrayVertexAttribBindingEXT(GLuint vaobj, GLuint att
{
SCOPED_SERIALISE_CONTEXT(VERTEXATTRIBBINDING);
Serialise_glVertexArrayVertexAttribBindingEXT(varecord->Resource.name, attribindex, bindingindex);
Serialise_glVertexArrayVertexAttribBindingEXT(vaobj, attribindex, bindingindex);
r->AddChunk(scope.Get());
}
@@ -2378,7 +2381,7 @@ void WrappedOpenGL::glVertexAttribBinding(GLuint attribindex, GLuint bindinginde
{
SCOPED_SERIALISE_CONTEXT(VERTEXATTRIBBINDING);
Serialise_glVertexArrayVertexAttribBindingEXT(varecord->Resource.name, attribindex, bindingindex);
Serialise_glVertexArrayVertexAttribBindingEXT(varecord ? varecord->Resource.name : 0, attribindex, bindingindex);
r->AddChunk(scope.Get());
}
@@ -2451,7 +2454,7 @@ void WrappedOpenGL::glVertexAttribFormat(GLuint attribindex, GLint size, GLenum
{
SCOPED_SERIALISE_CONTEXT(VERTEXATTRIBFORMAT);
Serialise_glVertexArrayVertexAttribFormatEXT(varecord->Resource.name, attribindex, size, type, normalized, relativeoffset);
Serialise_glVertexArrayVertexAttribFormatEXT(varecord ? varecord->Resource.name : 0, attribindex, size, type, normalized, relativeoffset);
r->AddChunk(scope.Get());
}
@@ -2523,7 +2526,7 @@ void WrappedOpenGL::glVertexAttribIFormat(GLuint attribindex, GLint size, GLenum
{
SCOPED_SERIALISE_CONTEXT(VERTEXATTRIBIFORMAT);
Serialise_glVertexArrayVertexAttribIFormatEXT(varecord->Resource.name, attribindex, size, type, relativeoffset);
Serialise_glVertexArrayVertexAttribIFormatEXT(varecord ? varecord->Resource.name : 0, attribindex, size, type, relativeoffset);
r->AddChunk(scope.Get());
}
@@ -2595,7 +2598,7 @@ void WrappedOpenGL::glVertexAttribLFormat(GLuint attribindex, GLint size, GLenum
{
SCOPED_SERIALISE_CONTEXT(VERTEXATTRIBLFORMAT);
Serialise_glVertexArrayVertexAttribLFormatEXT(varecord->Resource.name, attribindex, size, type, relativeoffset);
Serialise_glVertexArrayVertexAttribLFormatEXT(varecord ? varecord->Resource.name : 0, attribindex, size, type, relativeoffset);
r->AddChunk(scope.Get());
}
@@ -2677,7 +2680,7 @@ void WrappedOpenGL::glVertexAttribDivisor(GLuint index, GLuint divisor)
{
SCOPED_SERIALISE_CONTEXT(VERTEXATTRIBDIVISOR);
Serialise_glVertexArrayVertexAttribDivisorEXT(varecord->Resource.name, index, divisor);
Serialise_glVertexArrayVertexAttribDivisorEXT(varecord ? varecord->Resource.name : 0, index, divisor);
r->AddChunk(scope.Get());
}
@@ -2729,7 +2732,7 @@ void WrappedOpenGL::glEnableVertexArrayAttribEXT(GLuint vaobj, GLuint index)
{
SCOPED_SERIALISE_CONTEXT(ENABLEVERTEXATTRIBARRAY);
Serialise_glEnableVertexArrayAttribEXT(varecord->Resource.name, index);
Serialise_glEnableVertexArrayAttribEXT(vaobj, index);
r->AddChunk(scope.Get());
}
@@ -2756,7 +2759,7 @@ void WrappedOpenGL::glEnableVertexAttribArray(GLuint index)
{
SCOPED_SERIALISE_CONTEXT(ENABLEVERTEXATTRIBARRAY);
Serialise_glEnableVertexArrayAttribEXT(varecord->Resource.name, index);
Serialise_glEnableVertexArrayAttribEXT(varecord ? varecord->Resource.name : 0, index);
r->AddChunk(scope.Get());
}
@@ -2808,7 +2811,7 @@ void WrappedOpenGL::glDisableVertexArrayAttribEXT(GLuint vaobj, GLuint index)
{
SCOPED_SERIALISE_CONTEXT(DISABLEVERTEXATTRIBARRAY);
Serialise_glDisableVertexArrayAttribEXT(varecord->Resource.name, index);
Serialise_glDisableVertexArrayAttribEXT(vaobj, index);
r->AddChunk(scope.Get());
}
@@ -2835,7 +2838,7 @@ void WrappedOpenGL::glDisableVertexAttribArray(GLuint index)
{
SCOPED_SERIALISE_CONTEXT(DISABLEVERTEXATTRIBARRAY);
Serialise_glDisableVertexArrayAttribEXT(varecord->Resource.name, index);
Serialise_glDisableVertexArrayAttribEXT(varecord ? varecord->Resource.name : 0, index);
r->AddChunk(scope.Get());
}
@@ -3031,7 +3034,7 @@ void WrappedOpenGL::glBindVertexBuffer(GLuint bindingindex, GLuint buffer, GLint
{
SCOPED_SERIALISE_CONTEXT(BIND_VERTEXBUFFER);
Serialise_glVertexArrayBindVertexBufferEXT(varecord->Resource.name, bindingindex, buffer, offset, stride);
Serialise_glVertexArrayBindVertexBufferEXT(varecord ? varecord->Resource.name : 0, bindingindex, buffer, offset, stride);
r->AddChunk(scope.Get());
}
@@ -3078,7 +3081,7 @@ bool WrappedOpenGL::Serialise_glBindVertexBuffers(GLuint first, GLsizei count, c
if(m_State <= EXECUTING)
{
if(m_State == READING && m_CurEventID == 0)
if(m_State == READING && m_CurEventID == 0)
{
if(vid != ResourceId())
{
@@ -3196,7 +3199,7 @@ void WrappedOpenGL::glVertexBindingDivisor(GLuint bindingindex, GLuint divisor)
{
SCOPED_SERIALISE_CONTEXT(VERTEXBINDINGDIVISOR);
Serialise_glVertexArrayVertexBindingDivisorEXT(varecord->Resource.name, bindingindex, divisor);
Serialise_glVertexArrayVertexBindingDivisorEXT(varecord ? varecord->Resource.name : 0, bindingindex, divisor);
r->AddChunk(scope.Get());
}
renderdoc/driver/gl/wrappers/gl_texture_funcs.cpp
+21 -21
View File
@@ -4064,12 +4064,12 @@ bool WrappedOpenGL::Serialise_glTextureSubImage1DEXT(GLuint texture, GLenum targ
if(m_State <= EXECUTING)
{
if(!UnpackBufBound && m_State == READING && m_CurEventID == 0)
if(!UnpackBufBound && m_State == READING && m_CurEventID == 0)
m_Real.glBindBuffer(eGL_PIXEL_UNPACK_BUFFER, 0);
m_Real.glTextureSubImage1DEXT(GetResourceManager()->GetLiveResource(id).name, Target, Level, xoff, Width, Format, Type, buf ? buf : (const void *)bufoffs);
if(!UnpackBufBound && m_State == READING && m_CurEventID == 0)
if(!UnpackBufBound && m_State == READING && m_CurEventID == 0)
m_Real.glBindBuffer(eGL_PIXEL_UNPACK_BUFFER, unpackbuf);
SAFE_DELETE_ARRAY(buf);
@@ -4251,12 +4251,12 @@ bool WrappedOpenGL::Serialise_glTextureSubImage2DEXT(GLuint texture, GLenum targ
if(m_State <= EXECUTING)
{
if(!UnpackBufBound && m_State == READING && m_CurEventID == 0)
if(!UnpackBufBound && m_State == READING && m_CurEventID == 0)
m_Real.glBindBuffer(eGL_PIXEL_UNPACK_BUFFER, 0);
m_Real.glTextureSubImage2DEXT(GetResourceManager()->GetLiveResource(id).name, Target, Level, xoff, yoff, Width, Height, Format, Type, buf ? buf : (const void *)bufoffs);
if(!UnpackBufBound && m_State == READING && m_CurEventID == 0)
if(!UnpackBufBound && m_State == READING && m_CurEventID == 0)
m_Real.glBindBuffer(eGL_PIXEL_UNPACK_BUFFER, unpackbuf);
SAFE_DELETE_ARRAY(buf);
@@ -4440,12 +4440,12 @@ bool WrappedOpenGL::Serialise_glTextureSubImage3DEXT(GLuint texture, GLenum targ
if(m_State <= EXECUTING)
{
if(!UnpackBufBound && m_State == READING && m_CurEventID == 0)
if(!UnpackBufBound && m_State == READING && m_CurEventID == 0)
m_Real.glBindBuffer(eGL_PIXEL_UNPACK_BUFFER, 0);
m_Real.glTextureSubImage3DEXT(GetResourceManager()->GetLiveResource(id).name, Target, Level, xoff, yoff, zoff, Width, Height, Depth, Format, Type, buf ? buf : (const void *)bufoffs);
if(!UnpackBufBound && m_State == READING && m_CurEventID == 0)
if(!UnpackBufBound && m_State == READING && m_CurEventID == 0)
m_Real.glBindBuffer(eGL_PIXEL_UNPACK_BUFFER, unpackbuf);
SAFE_DELETE_ARRAY(buf);
@@ -4611,15 +4611,15 @@ bool WrappedOpenGL::Serialise_glCompressedTextureSubImage1DEXT(GLuint texture, G
SERIALISE_ELEMENT_BUF_OPT(byte *, buf, pixels, byteSize, !UnpackBufBound);
SERIALISE_ELEMENT(uint64_t, bufoffs, (uint64_t)pixels);
if(m_State <= EXECUTING)
{
if(!UnpackBufBound && m_State == READING && m_CurEventID == 0)
if(!UnpackBufBound && m_State == READING && m_CurEventID == 0)
m_Real.glBindBuffer(eGL_PIXEL_UNPACK_BUFFER, 0);
m_Real.glCompressedTextureSubImage1DEXT(GetResourceManager()->GetLiveResource(id).name, Target, Level, xoff, Width, fmt, byteSize, buf ? buf : (const void *)bufoffs);
if(!UnpackBufBound && m_State == READING && m_CurEventID == 0)
if(!UnpackBufBound && m_State == READING && m_CurEventID == 0)
m_Real.glBindBuffer(eGL_PIXEL_UNPACK_BUFFER, unpackbuf);
SAFE_DELETE_ARRAY(buf);
@@ -4790,12 +4790,12 @@ bool WrappedOpenGL::Serialise_glCompressedTextureSubImage2DEXT(GLuint texture, G
if(m_State <= EXECUTING)
{
if(!UnpackBufBound && m_State == READING && m_CurEventID == 0)
if(!UnpackBufBound && m_State == READING && m_CurEventID == 0)
m_Real.glBindBuffer(eGL_PIXEL_UNPACK_BUFFER, 0);
m_Real.glCompressedTextureSubImage2DEXT(GetResourceManager()->GetLiveResource(id).name, Target, Level, xoff, yoff, Width, Height, fmt, byteSize, buf ? buf : (const void *)bufoffs);
if(!UnpackBufBound && m_State == READING && m_CurEventID == 0)
if(!UnpackBufBound && m_State == READING && m_CurEventID == 0)
m_Real.glBindBuffer(eGL_PIXEL_UNPACK_BUFFER, unpackbuf);
SAFE_DELETE_ARRAY(buf);
@@ -4968,12 +4968,12 @@ bool WrappedOpenGL::Serialise_glCompressedTextureSubImage3DEXT(GLuint texture, G
if(m_State <= EXECUTING)
{
if(!UnpackBufBound && m_State == READING && m_CurEventID == 0)
if(!UnpackBufBound && m_State == READING && m_CurEventID == 0)
m_Real.glBindBuffer(eGL_PIXEL_UNPACK_BUFFER, 0);
m_Real.glCompressedTextureSubImage3DEXT(GetResourceManager()->GetLiveResource(id).name, Target, Level, xoff, yoff, zoff, Width, Height, Depth, fmt, byteSize, buf ? buf : (const void *)bufoffs);
if(!UnpackBufBound && m_State == READING && m_CurEventID == 0)
if(!UnpackBufBound && m_State == READING && m_CurEventID == 0)
m_Real.glBindBuffer(eGL_PIXEL_UNPACK_BUFFER, unpackbuf);
SAFE_DELETE_ARRAY(buf);
@@ -5137,7 +5137,7 @@ bool WrappedOpenGL::Serialise_glTextureBufferRangeEXT(GLuint texture, GLenum tar
if(m_State < WRITING)
{
if(m_State == READING && m_CurEventID == 0)
if(m_State == READING && m_CurEventID == 0)
{
ResourceId liveId = GetResourceManager()->GetLiveID(texid);
m_Textures[liveId].width = uint32_t(Size)/uint32_t(GetByteSize(1, 1, 1, GetBaseFormat(fmt), GetDataType(fmt), 1));
@@ -5216,7 +5216,7 @@ bool WrappedOpenGL::Serialise_glTextureBufferEXT(GLuint texture, GLenum target,
{
buffer = GetResourceManager()->GetLiveResource(bufid).name;
if(m_State == READING && m_CurEventID == 0)
if(m_State == READING && m_CurEventID == 0)
{
ResourceId liveId = GetResourceManager()->GetLiveID(texid);
uint32_t Size = 1;