lee/renderdoc
1
0 Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-11-14 18:00:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid doing a 0-byte glCopyBufferSubData as this can crash on AMD

Browse Source
This commit is contained in:
baldurk committed 2019-01-11 15:23:35 +00:00
1 parent 32dbfd6263
commit 8b28e0ed6d
1 file changed
+7 -5
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/gl_initstate.cpp
+7 -5
View File
@@ -409,7 +409,7 @@ bool GLResourceManager::Prepare_InitialState(GLResource res)
if(res.Namespace == eResBuffer)
{
// get the length of the buffer
uint32_t length = 1;
uint32_t length = 4;
GL.glGetNamedBufferParameterivEXT(res.name, eGL_BUFFER_SIZE, (GLint *)&length);
// save old bindings
@@ -421,13 +421,14 @@ bool GLResourceManager::Prepare_InitialState(GLResource res)
GLuint buf = 0;
GL.glGenBuffers(1, &buf);
GL.glBindBuffer(eGL_COPY_WRITE_BUFFER, buf);
GL.glNamedBufferDataEXT(buf, (GLsizeiptr)length, NULL, eGL_STATIC_READ);
GL.glNamedBufferDataEXT(buf, (GLsizeiptr)RDCMAX(length, 4U), NULL, eGL_STATIC_READ);
// bind the live buffer for copying
GL.glBindBuffer(eGL_COPY_READ_BUFFER, res.name);
// do the actual copy
GL.glCopyBufferSubData(eGL_COPY_READ_BUFFER, eGL_COPY_WRITE_BUFFER, 0, 0, (GLsizeiptr)length);
if(length > 0)
GL.glCopyBufferSubData(eGL_COPY_READ_BUFFER, eGL_COPY_WRITE_BUFFER, 0, 0, (GLsizeiptr)length);
// restore old bindings
GL.glBindBuffer(eGL_COPY_READ_BUFFER, oldbuf1);
@@ -1772,8 +1773,9 @@ void GLResourceManager::Apply_InitialState(GLResource live, GLInitialContents in
GL.glBindBuffer(eGL_COPY_WRITE_BUFFER, live.name);
// do the actual copy
GL.glCopyBufferSubData(eGL_COPY_READ_BUFFER, eGL_COPY_WRITE_BUFFER, 0, 0,
(GLsizeiptr)initial.bufferLength);
if(initial.bufferLength > 0)
GL.glCopyBufferSubData(eGL_COPY_READ_BUFFER, eGL_COPY_WRITE_BUFFER, 0, 0,
(GLsizeiptr)initial.bufferLength);
// restore old bindings
GL.glBindBuffer(eGL_COPY_READ_BUFFER, oldbuf1);