lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-25 23:25:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle instanced client memory arrays in GL

Browse Source
This commit is contained in:
baldurk
2020-07-21 19:57:09 +01:00
parent 331aabcde6
commit 0d8c36d6e8
2 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/gl_driver.h
+2 -1
View File
@@ -514,7 +514,8 @@ private:
rdcarray<VertexAttrib> attribs;
GLuint prevArrayBufferBinding;
};
ClientMemoryData *CopyClientMemoryArrays(GLint first, GLsizei count, GLenum indexType,
ClientMemoryData *CopyClientMemoryArrays(GLint first, GLsizei count, GLint baseinstance,
GLsizei instancecount, GLenum indexType,
const void *&indices);
void RestoreClientMemoryArrays(ClientMemoryData *clientMemoryArrays, GLenum indexType);
renderdoc/driver/gl/wrappers/gl_draw_funcs.cpp
+35 -12
View File
@@ -976,6 +976,8 @@ bool WrappedOpenGL::Serialise_glDrawArrays(SerialiserType &ser, GLenum mode, GLi
}
WrappedOpenGL::ClientMemoryData *WrappedOpenGL::CopyClientMemoryArrays(GLint first, GLsizei count,
GLint baseinstance,
GLsizei instancecount,
GLenum indexType,
const void *&indices)
{
@@ -1025,7 +1027,22 @@ WrappedOpenGL::ClientMemoryData *WrappedOpenGL::CopyClientMemoryArrays(GLint fir
if(buffer != 0)
continue;
if(indexType != eGL_NONE && first == -1)
GLint divisor = 0;
GL.glGetVertexAttribiv(i, eGL_VERTEX_ATTRIB_ARRAY_DIVISOR, &divisor);
if(divisor > 0)
{
if(baseinstance < 0)
first = 0;
else
first = baseinstance / divisor;
if(instancecount < 0)
count = 1;
else
count = instancecount / divisor;
}
else if(indexType != eGL_NONE && first == -1)
{
bytebuf readbackIndices;
@@ -1162,7 +1179,7 @@ void WrappedOpenGL::glDrawArrays(GLenum mode, GLint first, GLsizei count)
if(IsActiveCapturing(m_State))
{
const void *indices = NULL;
ClientMemoryData *clientMemory = CopyClientMemoryArrays(first, count, eGL_NONE, indices);
ClientMemoryData *clientMemory = CopyClientMemoryArrays(first, count, -1, -1, eGL_NONE, indices);
USE_SCRATCH_SERIALISER();
@@ -1319,7 +1336,8 @@ void WrappedOpenGL::glDrawArraysInstanced(GLenum mode, GLint first, GLsizei coun
if(IsActiveCapturing(m_State))
{
const void *indices = NULL;
ClientMemoryData *clientMemory = CopyClientMemoryArrays(first, count, eGL_NONE, indices);
ClientMemoryData *clientMemory =
CopyClientMemoryArrays(first, count, -1, instancecount, eGL_NONE, indices);
USE_SCRATCH_SERIALISER();
@@ -1400,7 +1418,8 @@ void WrappedOpenGL::glDrawArraysInstancedBaseInstance(GLenum mode, GLint first,
if(IsActiveCapturing(m_State))
{
const void *indices = NULL;
ClientMemoryData *clientMemory = CopyClientMemoryArrays(first, count, eGL_NONE, indices);
ClientMemoryData *clientMemory =
CopyClientMemoryArrays(first, count, baseinstance, instancecount, eGL_NONE, indices);
USE_SCRATCH_SERIALISER();
@@ -1478,7 +1497,7 @@ void WrappedOpenGL::glDrawElements(GLenum mode, GLsizei count, GLenum type, cons
if(IsActiveCapturing(m_State))
{
ClientMemoryData *clientMemory = CopyClientMemoryArrays(-1, count, type, indices);
ClientMemoryData *clientMemory = CopyClientMemoryArrays(-1, count, -1, -1, type, indices);
USE_SCRATCH_SERIALISER();
@@ -1646,7 +1665,7 @@ void WrappedOpenGL::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, G
if(IsActiveCapturing(m_State))
{
ClientMemoryData *clientMemory = CopyClientMemoryArrays(-1, count, type, indices);
ClientMemoryData *clientMemory = CopyClientMemoryArrays(-1, count, -1, -1, type, indices);
USE_SCRATCH_SERIALISER();
@@ -1733,7 +1752,7 @@ void WrappedOpenGL::glDrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLu
if(IsActiveCapturing(m_State))
{
ClientMemoryData *clientMemory = CopyClientMemoryArrays(-1, count, type, indices);
ClientMemoryData *clientMemory = CopyClientMemoryArrays(-1, count, -1, -1, type, indices);
USE_SCRATCH_SERIALISER();
@@ -1814,7 +1833,7 @@ void WrappedOpenGL::glDrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum
if(IsActiveCapturing(m_State))
{
ClientMemoryData *clientMemory = CopyClientMemoryArrays(-1, count, type, indices);
ClientMemoryData *clientMemory = CopyClientMemoryArrays(-1, count, -1, -1, type, indices);
USE_SCRATCH_SERIALISER();
@@ -1895,7 +1914,8 @@ void WrappedOpenGL::glDrawElementsInstanced(GLenum mode, GLsizei count, GLenum t
if(IsActiveCapturing(m_State))
{
ClientMemoryData *clientMemory = CopyClientMemoryArrays(-1, count, type, indices);
ClientMemoryData *clientMemory =
CopyClientMemoryArrays(-1, count, -1, instancecount, type, indices);
USE_SCRATCH_SERIALISER();
@@ -1982,7 +2002,8 @@ void WrappedOpenGL::glDrawElementsInstancedBaseInstance(GLenum mode, GLsizei cou
if(IsActiveCapturing(m_State))
{
ClientMemoryData *clientMemory = CopyClientMemoryArrays(-1, count, type, indices);
ClientMemoryData *clientMemory =
CopyClientMemoryArrays(-1, count, baseinstance, instancecount, type, indices);
USE_SCRATCH_SERIALISER();
@@ -2070,7 +2091,8 @@ void WrappedOpenGL::glDrawElementsInstancedBaseVertex(GLenum mode, GLsizei count
if(IsActiveCapturing(m_State))
{
ClientMemoryData *clientMemory = CopyClientMemoryArrays(-1, count, type, indices);
ClientMemoryData *clientMemory =
CopyClientMemoryArrays(-1, count, -1, instancecount, type, indices);
USE_SCRATCH_SERIALISER();
@@ -2159,7 +2181,8 @@ void WrappedOpenGL::glDrawElementsInstancedBaseVertexBaseInstance(GLenum mode, G
if(IsActiveCapturing(m_State))
{
ClientMemoryData *clientMemory = CopyClientMemoryArrays(-1, count, type, indices);
ClientMemoryData *clientMemory =
CopyClientMemoryArrays(-1, count, baseinstance, instancecount, type, indices);
USE_SCRATCH_SERIALISER();