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

Bind resources while in READING, as we're replaying edit chunks

Browse Source 
* While replaying the initial chunks, we're doing edit type operations but
  we haven't serialised out the binding operations in between, so in this
  state we do the bind-to-edit binds ourselves.
This commit is contained in:
baldurk
2014-06-01 11:54:54 +01:00
parent c4fa9f0fd6
commit 9b8adebb91
7 changed files with 97 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/gl_context_driver.cpp
+1 -1
View File
@@ -279,7 +279,7 @@ bool WrappedOpenGL::Serialise_glDepthFunc(GLenum func)
if(m_State <= EXECUTING)
{
m_Real.glDepthFunc(func);
m_Real.glDepthFunc(f);
}
return true;
renderdoc/driver/gl/gl_device_driver.cpp
+87 -8
View File
@@ -102,10 +102,17 @@ bool WrappedOpenGL::Serialise_glBindTexture(GLenum target, GLuint texture)
}
else if(m_State < WRITING)
{
GLResource res = GetResourceManager()->GetLiveResource(Id);
m_Real.glBindTexture(Target, res.name);
if(Id == ResourceId())
{
m_Real.glBindTexture(Target, 0);
}
else
{
GLResource res = GetResourceManager()->GetLiveResource(Id);
m_Real.glBindTexture(Target, res.name);
m_Textures[GetResourceManager()->GetLiveID(Id)].curType = Target;
m_Textures[GetResourceManager()->GetLiveID(Id)].curType = Target;
}
}
return true;
@@ -277,9 +284,12 @@ bool WrappedOpenGL::Serialise_glTexParameteri(GLenum target, GLenum pname, GLint
SERIALISE_ELEMENT(GLenum, Target, target);
SERIALISE_ELEMENT(GLenum, PName, pname);
SERIALISE_ELEMENT(int32_t, Param, param);
SERIALISE_ELEMENT(ResourceId, id, m_TextureRecord[m_TextureUnit]->GetResourceID());
if(m_State < WRITING)
{
if(m_State == READING)
m_Real.glBindTexture(Target, GetResourceManager()->GetLiveResource(id).name);
glTexParameteri(Target, PName, Param);
}
@@ -711,9 +721,40 @@ bool WrappedOpenGL::Serialise_glFramebufferTexture(GLenum target, GLenum attachm
SERIALISE_ELEMENT(GLenum, Attach, attachment);
SERIALISE_ELEMENT(ResourceId, id, GetResourceManager()->GetID(TextureRes(texture)));
SERIALISE_ELEMENT(int32_t, Level, level);
ResourceId curFrameBuffer;
if(m_State == WRITING_IDLE)
{
if(target == eGL_DRAW_FRAMEBUFFER || target == eGL_FRAMEBUFFER)
{
if(m_DrawFramebufferRecord)
curFrameBuffer = m_DrawFramebufferRecord->GetResourceID();
}
else
{
if(m_ReadFramebufferRecord)
curFrameBuffer = m_ReadFramebufferRecord->GetResourceID();
}
}
SERIALISE_ELEMENT(ResourceId, fbid, curFrameBuffer);
if(m_State < WRITING)
{
if(m_State == READING)
{
if(fbid != ResourceId())
{
GLResource res = GetResourceManager()->GetLiveResource(fbid);
m_Real.glBindFramebuffer(Target, res.name);
}
else
{
m_Real.glBindFramebuffer(Target, 0);
}
}
GLResource res = GetResourceManager()->GetLiveResource(id);
glFramebufferTexture(Target, Attach, res.name, Level);
}
@@ -735,16 +776,16 @@ void WrappedOpenGL::glFramebufferTexture(GLenum target, GLenum attachment, GLuin
if(target == eGL_DRAW_FRAMEBUFFER || target == eGL_FRAMEBUFFER)
{
if(m_DrawFramebufferRecord)
m_DeviceRecord->AddChunk(scope.Get());
else
m_DrawFramebufferRecord->AddChunk(scope.Get());
else
m_DeviceRecord->AddChunk(scope.Get());
}
else
{
if(m_ReadFramebufferRecord)
m_DeviceRecord->AddChunk(scope.Get());
else
m_ReadFramebufferRecord->AddChunk(scope.Get());
else
m_DeviceRecord->AddChunk(scope.Get());
}
}
else
@@ -755,9 +796,22 @@ void WrappedOpenGL::glFramebufferTexture(GLenum target, GLenum attachment, GLuin
bool WrappedOpenGL::Serialise_glReadBuffer(GLenum mode)
{
SERIALISE_ELEMENT(GLenum, m, mode);
SERIALISE_ELEMENT(ResourceId, id, m_ReadFramebufferRecord ? m_ReadFramebufferRecord->GetResourceID() : ResourceId());
if(m_State < WRITING)
{
if(id != ResourceId())
{
GLResource res = GetResourceManager()->GetLiveResource(id);
m_Real.glBindFramebuffer(eGL_READ_FRAMEBUFFER, res.name);
}
else
{
m_Real.glBindFramebuffer(eGL_READ_FRAMEBUFFER, 0);
}
m_Real.glReadBuffer(m);
}
return true;
}
@@ -1864,7 +1918,10 @@ bool WrappedOpenGL::Serialise_glUnmapBuffer(GLenum target)
if(m_State == READING)
{
m_Real.glBindBufferRange(eGL_UNIFORM_BUFFER, 0, oldBuf, (GLintptr)oldBufBase, (GLsizeiptr)oldBufSize);
if(oldBufBase == 0 && oldBufSize == 0)
m_Real.glBindBufferBase(eGL_UNIFORM_BUFFER, 0, oldBuf);
else
m_Real.glBindBufferRange(eGL_UNIFORM_BUFFER, 0, oldBuf, (GLintptr)oldBufBase, (GLsizeiptr)oldBufSize);
}
}
@@ -1985,9 +2042,20 @@ void WrappedOpenGL::glVertexAttribPointer(GLuint index, GLint size, GLenum type,
bool WrappedOpenGL::Serialise_glEnableVertexAttribArray(GLuint index)
{
SERIALISE_ELEMENT(uint32_t, Index, index);
SERIALISE_ELEMENT(ResourceId, id, m_VertexArrayRecord ? m_VertexArrayRecord->GetResourceID() : ResourceId());
if(m_State < WRITING)
{
if(id != ResourceId())
{
GLResource res = GetResourceManager()->GetLiveResource(id);
m_Real.glBindVertexArray(res.name);
}
else
{
m_Real.glBindVertexArray(0);
}
m_Real.glEnableVertexAttribArray(Index);
}
return true;
@@ -2012,9 +2080,20 @@ void WrappedOpenGL::glEnableVertexAttribArray(GLuint index)
bool WrappedOpenGL::Serialise_glDisableVertexAttribArray(GLuint index)
{
SERIALISE_ELEMENT(uint32_t, Index, index);
SERIALISE_ELEMENT(ResourceId, id, m_VertexArrayRecord ? m_VertexArrayRecord->GetResourceID() : ResourceId());
if(m_State < WRITING)
{
if(id != ResourceId())
{
GLResource res = GetResourceManager()->GetLiveResource(id);
m_Real.glBindVertexArray(res.name);
}
else
{
m_Real.glBindVertexArray(0);
}
m_Real.glDisableVertexAttribArray(Index);
}
return true;
renderdoc/driver/gl/gl_driver.cpp
+3
View File
@@ -1138,6 +1138,9 @@ void WrappedOpenGL::ProcessChunk(uint64_t offset, GLChunkType context)
case UNIFORM_VECTOR:
Serialise_glUniformVector(0, 0, NULL, UNIFORM_UNKNOWN);
break;
case DRAWARRAYS:
Serialise_glDrawArrays(eGL_UNKNOWN_ENUM, 0, 0);
break;
case DRAWARRAYS_INSTANCEDBASEDINSTANCE:
Serialise_glDrawArraysInstancedBaseInstance(eGL_UNKNOWN_ENUM, 0, 0, 0, 0);
break;
renderdoc/driver/gl/gl_driver.h
+1 -1
View File
@@ -99,7 +99,7 @@ class WrappedOpenGL
{ ((WrappedOpenGL *)userParam)->DebugSnoop(source, type, id, severity, length, message); }
// state
GLResourceRecord *m_TextureRecord[128];
GLResourceRecord *m_TextureRecord[128]; // TODO this needs on per texture type :(
GLResourceRecord *m_BufferRecord[16];
GLResourceRecord *m_VertexArrayRecord;
GLResourceRecord *m_DrawFramebufferRecord;
renderdoc/driver/gl/gl_replay.cpp
+3
View File
@@ -489,6 +489,9 @@ FetchBuffer GLReplay::GetBuffer(ResourceId id)
case eGL_ELEMENT_ARRAY_BUFFER:
ret.creationFlags = eBufferCreate_IB;
break;
case eGL_UNIFORM_BUFFER:
ret.creationFlags = eBufferCreate_CB;
break;
default:
RDCERR("Unexpected buffer type %hs", ToStr::Get(res.curType).c_str());
}
renderdoc/replay/replay_enums.h
+1
View File
@@ -201,6 +201,7 @@ enum BufferCreationFlags
{
eBufferCreate_VB = 0x1,
eBufferCreate_IB = 0x2,
eBufferCreate_CB = 0x4,
};
enum TextureCreationFlags
renderdocui/Interop/Enums.cs
+1
View File
@@ -204,6 +204,7 @@ namespace renderdoc
{
VB = 0x1,
IB = 0x2,
CB = 0x4,
};
[Flags]