lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-24 15:36:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement missing glMultiDraw functions

Browse Source
This commit is contained in:
baldurk
2014-11-25 21:43:42 +00:00
parent eccde9c8b6
commit cbc4c4cc43
6 changed files with 228 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/gl_common.h
+3
View File
@@ -254,6 +254,9 @@ enum GLChunkType
DRAWELEMENTS_INSTANCEDBASEVERTEXBASEINSTANCE,
MULTI_DRAWARRAYS,
MULTI_DRAWELEMENTS,
MULTI_DRAWELEMENTSBASEVERTEX,
MULTI_DRAWARRAYS_INDIRECT,
MULTI_DRAWELEMENTS_INDIRECT,
GEN_FRAMEBUFFERS,
FRAMEBUFFER_TEX,
renderdoc/driver/gl/gl_driver.cpp
+12
View File
@@ -199,6 +199,9 @@ const char *GLChunkNames[] =
"glDrawElementsInstancedBaseVertexBaseInstance",
"glMultiDrawArrays",
"glMultiDrawElements",
"glMultiDrawElementsBaseVertex",
"glMultiDrawArraysIndirect",
"glMultiDrawElementsIndirect",
"glGenFramebuffers",
"glFramebufferTexture",
@@ -2026,6 +2029,15 @@ void WrappedOpenGL::ProcessChunk(uint64_t offset, GLChunkType context)
case MULTI_DRAWELEMENTS:
Serialise_glMultiDrawElements(eGL_NONE, NULL, eGL_NONE, NULL, 0);
break;
case MULTI_DRAWELEMENTSBASEVERTEX:
Serialise_glMultiDrawElementsBaseVertex(eGL_NONE, NULL, eGL_NONE, NULL, 0, NULL);
break;
case MULTI_DRAWARRAYS_INDIRECT:
Serialise_glMultiDrawArraysIndirect(eGL_NONE, NULL, 0, 0);
break;
case MULTI_DRAWELEMENTS_INDIRECT:
Serialise_glMultiDrawElementsIndirect(eGL_NONE, eGL_NONE, NULL, 0, 0);
break;
case GEN_FRAMEBUFFERS:
Serialise_glGenFramebuffers(0, NULL);
renderdoc/driver/gl/gl_driver.h
+3
View File
@@ -981,6 +981,9 @@ class WrappedOpenGL
IMPLEMENT_FUNCTION_SERIALISED(void, glDrawElementsInstancedBaseVertexBaseInstance(GLenum mode, GLsizei count, GLenum type, const void * indices, GLsizei instancecount, GLint basevertex, GLuint baseinstance));
IMPLEMENT_FUNCTION_SERIALISED(void, glMultiDrawArrays(GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount));
IMPLEMENT_FUNCTION_SERIALISED(void, glMultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount));
IMPLEMENT_FUNCTION_SERIALISED(void, glMultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount, const GLint *basevertex));
IMPLEMENT_FUNCTION_SERIALISED(void, glMultiDrawArraysIndirect(GLenum mode, const void *indirect, GLsizei drawcount, GLsizei stride));
IMPLEMENT_FUNCTION_SERIALISED(void, glMultiDrawElementsIndirect(GLenum mode, GLenum type, const void *indirect, GLsizei drawcount, GLsizei stride));
IMPLEMENT_FUNCTION_SERIALISED(void, glDrawArraysIndirect(GLenum mode, const void *indirect));
IMPLEMENT_FUNCTION_SERIALISED(void, glDrawElementsIndirect(GLenum mode, GLenum type, const void *indirect));
IMPLEMENT_FUNCTION_SERIALISED(void, glDeleteBuffers(GLsizei n, const GLuint *buffers));
renderdoc/driver/gl/gl_hookset.h
+3
View File
@@ -587,6 +587,9 @@ struct GLHookSet
PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC glDrawElementsInstancedBaseVertexBaseInstance;
PFNGLMULTIDRAWARRAYSPROC glMultiDrawArrays;
PFNGLMULTIDRAWELEMENTSPROC glMultiDrawElements;
PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC glMultiDrawElementsBaseVertex;
PFNGLMULTIDRAWARRAYSINDIRECTPROC glMultiDrawArraysIndirect;
PFNGLMULTIDRAWELEMENTSINDIRECTPROC glMultiDrawElementsIndirect;
PFNGLDRAWARRAYSINDIRECTPROC glDrawArraysIndirect;
PFNGLDRAWELEMENTSINDIRECTPROC glDrawElementsIndirect;
PFNGLBLITFRAMEBUFFERPROC glBlitFramebuffer;
renderdoc/driver/gl/gl_hookset_defs.h
+6
View File
@@ -619,6 +619,9 @@
HookExtension(PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC, glDrawElementsInstancedBaseVertexBaseInstance); \
HookExtension(PFNGLMULTIDRAWARRAYSPROC, glMultiDrawArrays); \
HookExtension(PFNGLMULTIDRAWELEMENTSPROC, glMultiDrawElements); \
HookExtension(PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC, glMultiDrawElementsBaseVertex); \
HookExtension(PFNGLMULTIDRAWARRAYSINDIRECTPROC, glMultiDrawArraysIndirect); \
HookExtension(PFNGLMULTIDRAWELEMENTSINDIRECTPROC, glMultiDrawElementsIndirect); \
HookExtension(PFNGLDRAWARRAYSINDIRECTPROC, glDrawArraysIndirect); \
HookExtension(PFNGLDRAWELEMENTSINDIRECTPROC, glDrawElementsIndirect); \
HookExtension(PFNGLBLITFRAMEBUFFERPROC, glBlitFramebuffer); \
@@ -1294,6 +1297,9 @@
HookWrapper7(void, glDrawElementsInstancedBaseVertexBaseInstance, GLenum, mode, GLsizei, count, GLenum, type, const void *, indices, GLsizei, instancecount, GLint, basevertex, GLuint, baseinstance); \
HookWrapper4(void, glMultiDrawArrays, GLenum, mode, const GLint *, first, const GLsizei *, count, GLsizei, drawcount); \
HookWrapper5(void, glMultiDrawElements, GLenum, mode, const GLsizei *, count, GLenum, type, const void *const*, indices, GLsizei, drawcount); \
HookWrapper6(void, glMultiDrawElementsBaseVertex, GLenum, mode, const GLsizei *, count, GLenum, type, const void *const*, indices, GLsizei, drawcount, const GLint *, basevertex); \
HookWrapper4(void, glMultiDrawArraysIndirect, GLenum, mode, const void *, indirect, GLsizei, drawcount, GLsizei, stride); \
HookWrapper5(void, glMultiDrawElementsIndirect, GLenum, mode, GLenum, type, const void *, indirect, GLsizei, drawcount, GLsizei, stride); \
HookWrapper2(void, glDrawArraysIndirect, GLenum, mode, const void *, indirect); \
HookWrapper3(void, glDrawElementsIndirect, GLenum, mode, GLenum, type, const void *, indirect); \
HookWrapper10(void, glBlitFramebuffer, GLint, srcX0, GLint, srcY0, GLint, srcX1, GLint, srcY1, GLint, dstX0, GLint, dstY0, GLint, dstX1, GLint, dstY1, GLbitfield, mask, GLenum, filter); \
renderdoc/driver/gl/wrappers/gl_draw_funcs.cpp
+201
View File
@@ -1133,6 +1133,207 @@ void WrappedOpenGL::glMultiDrawElements(GLenum mode, const GLsizei *count, GLenu
}
}
bool WrappedOpenGL::Serialise_glMultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount, const GLint *basevertex)
{
SERIALISE_ELEMENT(GLenum, Mode, mode);
SERIALISE_ELEMENT(GLenum, Type, type);
SERIALISE_ELEMENT(uint32_t, Count, drawcount);
SERIALISE_ELEMENT_ARR(int32_t, countArray, count, Count);
SERIALISE_ELEMENT_ARR(int32_t, baseArray, basevertex, Count);
void **idxOffsArray = new void*[Count];
size_t len = Count;
// serialise pointer array as uint64s
if(m_State >= WRITING)
{
for(uint32_t i=0; i < Count; i++)
{
uint64_t ptr = (uint64_t)indices[i];
m_pSerialiser->Serialise("idxOffsArray", ptr);
}
}
else
{
for(uint32_t i=0; i < Count; i++)
{
uint64_t ptr = 0;
m_pSerialiser->Serialise("idxOffsArray", ptr);
idxOffsArray[i] = (void *)ptr;
}
}
if(m_State <= EXECUTING)
{
m_Real.glMultiDrawElementsBaseVertex(Mode, countArray, Type, idxOffsArray, Count, baseArray);
}
const string desc = m_pSerialiser->GetDebugStr();
vector<DebugMessage> debugMessages = Serialise_DebugMessages();
if(m_State == READING)
{
AddEvent(MULTI_DRAWARRAYS, desc);
string name = "glMultiDrawElementsBaseVertex(" +
ToStr::Get(Mode) + ", " +
ToStr::Get(Count) + ")";
RDCUNIMPLEMENTED("Not processing multi-draw data for glMultiDrawElements() display");
FetchDrawcall draw;
draw.name = name;
draw.numIndices = 1;
draw.numInstances = 1;
draw.indexOffset = 0;
draw.vertexOffset = 0;
draw.instanceOffset = 0;
draw.flags |= eDraw_Drawcall;
draw.debugMessages = debugMessages;
m_LastDrawMode = Mode;
AddDrawcall(draw, true);
}
SAFE_DELETE_ARRAY(countArray);
SAFE_DELETE_ARRAY(baseArray);
SAFE_DELETE_ARRAY(idxOffsArray);
return true;
}
void WrappedOpenGL::glMultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount, const GLint *basevertex)
{
m_Real.glMultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
if(m_State == WRITING_CAPFRAME)
{
SCOPED_SERIALISE_CONTEXT(MULTI_DRAWELEMENTSBASEVERTEX);
Serialise_glMultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
m_ContextRecord->AddChunk(scope.Get());
}
}
bool WrappedOpenGL::Serialise_glMultiDrawArraysIndirect(GLenum mode, const void *indirect, GLsizei drawcount, GLsizei stride)
{
SERIALISE_ELEMENT(GLenum, Mode, mode);
SERIALISE_ELEMENT(uint64_t, Offset, (uint64_t)indirect);
SERIALISE_ELEMENT(uint32_t, Count, drawcount);
SERIALISE_ELEMENT(uint32_t, Stride, stride);
if(m_State <= EXECUTING)
{
m_Real.glMultiDrawArraysIndirect(Mode, (const void *)Offset, Count, Stride);
}
const string desc = m_pSerialiser->GetDebugStr();
vector<DebugMessage> debugMessages = Serialise_DebugMessages();
if(m_State == READING)
{
AddEvent(DRAWARRAYS_INDIRECT, desc);
string name = "glMultiDrawArraysIndirect(" +
ToStr::Get(Mode) + ")";
RDCUNIMPLEMENTED("Not fetching indirect data for glMultiDrawArraysIndirect() display");
FetchDrawcall draw;
draw.name = name;
draw.numIndices = 1;
draw.numInstances = 1;
draw.indexOffset = 0;
draw.vertexOffset = 0;
draw.instanceOffset = 0;
draw.flags |= eDraw_Drawcall;
draw.debugMessages = debugMessages;
m_LastDrawMode = Mode;
AddDrawcall(draw, true);
}
return true;
}
void WrappedOpenGL::glMultiDrawArraysIndirect(GLenum mode, const void *indirect, GLsizei drawcount, GLsizei stride)
{
m_Real.glMultiDrawArraysIndirect(mode, indirect, drawcount, stride);
if(m_State == WRITING_CAPFRAME)
{
SCOPED_SERIALISE_CONTEXT(MULTI_DRAWELEMENTS_INDIRECT);
Serialise_glMultiDrawArraysIndirect(mode, indirect, drawcount, stride);
m_ContextRecord->AddChunk(scope.Get());
}
}
bool WrappedOpenGL::Serialise_glMultiDrawElementsIndirect(GLenum mode, GLenum type, const void *indirect, GLsizei drawcount, GLsizei stride)
{
SERIALISE_ELEMENT(GLenum, Mode, mode);
SERIALISE_ELEMENT(GLenum, Type, type);
SERIALISE_ELEMENT(uint64_t, Offset, (uint64_t)indirect);
SERIALISE_ELEMENT(uint32_t, Count, drawcount);
SERIALISE_ELEMENT(uint32_t, Stride, stride);
if(m_State <= EXECUTING)
{
m_Real.glMultiDrawElementsIndirect(Mode, Type, (const void *)Offset, Count, Stride);
}
const string desc = m_pSerialiser->GetDebugStr();
vector<DebugMessage> debugMessages = Serialise_DebugMessages();
if(m_State == READING)
{
AddEvent(DRAWARRAYS_INDIRECT, desc);
string name = "glMultiDrawElementsIndirect(" +
ToStr::Get(Mode) + ")";
RDCUNIMPLEMENTED("Not fetching indirect data for glMultiDrawElementsIndirect() display");
FetchDrawcall draw;
draw.name = name;
draw.numIndices = 1;
draw.numInstances = 1;
draw.indexOffset = 0;
draw.vertexOffset = 0;
draw.instanceOffset = 0;
draw.flags |= eDraw_Drawcall;
draw.debugMessages = debugMessages;
m_LastDrawMode = Mode;
AddDrawcall(draw, true);
}
return true;
}
void WrappedOpenGL::glMultiDrawElementsIndirect(GLenum mode, GLenum type, const void *indirect, GLsizei drawcount, GLsizei stride)
{
m_Real.glMultiDrawElementsIndirect(mode, type, indirect, drawcount, stride);
if(m_State == WRITING_CAPFRAME)
{
SCOPED_SERIALISE_CONTEXT(MULTI_DRAWELEMENTS_INDIRECT);
Serialise_glMultiDrawElementsIndirect(mode, type, indirect, drawcount, stride);
m_ContextRecord->AddChunk(scope.Get());
}
}
bool WrappedOpenGL::Serialise_glClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)
{
SERIALISE_ELEMENT(GLenum, buf, buffer);