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

Persistent Map()s part 1 - remove case handling where DataPtr == NULL

Browse Source 
* This should be impossible, as Map() is only valid after glBufferData
  or glBufferStorage, and both of those will unconditionally set a data
  pointer to backing store.
This commit is contained in:
baldurk
2015-02-23 12:36:03 +00:00
parent da3ea0931b
commit d205572b9c
1 changed files with 5 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/wrappers/gl_buffer_funcs.cpp
+5 -41
View File
@@ -1388,22 +1388,7 @@ void *WrappedOpenGL::glMapNamedBufferEXT(GLuint buffer, GLenum access)
byte *ptr = record->GetDataPtr();
// we can only 'ignore' a buffer map if we're idle, if we're capframing
// we must create shadow stores and intercept it. If we choose to ignore
// this buffer map because we don't have backing store, it will probably
// get the buffer marked as dirty (although in theory we could create a
// backing store from the unmap chunk, provided we have mapped the whole
// buffer.
if(ptr == NULL && m_State == WRITING_IDLE)
{
RDCWARN("Mapping buffer that hasn't been allocated");
ptr = (byte *)m_Real.glMapNamedBufferEXT(buffer, access);
record->Map.ptr = ptr;
record->Map.status = GLResourceRecord::Mapped_Write_Real;
}
else
RDCASSERT(ptr);
{
if(m_State == WRITING_CAPFRAME)
{
@@ -1475,10 +1460,10 @@ void *WrappedOpenGL::glMapNamedBufferRangeEXT(GLuint buffer, GLintptr offset, GL
GLResourceRecord *record = GetResourceManager()->GetResourceRecord(BufferRes(GetCtx(), buffer));
bool straightUp = false;
if(m_HighTrafficResources.find(record->GetResourceID()) != m_HighTrafficResources.end() && m_State != WRITING_CAPFRAME)
if(m_State != WRITING_CAPFRAME && m_HighTrafficResources.find(record->GetResourceID()) != m_HighTrafficResources.end())
straightUp = true;
if(GetResourceManager()->IsResourceDirty(record->GetResourceID()) && m_State != WRITING_CAPFRAME)
if(!straightUp && m_State != WRITING_CAPFRAME && GetResourceManager()->IsResourceDirty(record->GetResourceID()))
straightUp = true;
bool invalidateMap = (access & (GL_MAP_INVALIDATE_BUFFER_BIT|GL_MAP_INVALIDATE_RANGE_BIT)) != 0;
@@ -1512,13 +1497,7 @@ void *WrappedOpenGL::glMapNamedBufferRangeEXT(GLuint buffer, GLintptr offset, GL
{
byte *ptr = record->GetDataPtr();
if(ptr == NULL)
{
RDCWARN("Mapping buffer that hasn't been allocated");
record->Map.status = GLResourceRecord::Mapped_Read_Real;
return m_Real.glMapNamedBufferRangeEXT(buffer, offset, length, access);
}
RDCASSERT(ptr);
ptr += offset;
@@ -1531,22 +1510,7 @@ void *WrappedOpenGL::glMapNamedBufferRangeEXT(GLuint buffer, GLintptr offset, GL
byte *ptr = record->GetDataPtr();
// we can only 'ignore' a buffer map if we're idle, if we're capframing
// we must create shadow stores and intercept it. If we choose to ignore
// this buffer map because we don't have backing store, it will probably
// get the buffer marked as dirty (although in theory we could create a
// backing store from the unmap chunk, provided we have mapped the whole
// buffer.
if(ptr == NULL && m_State == WRITING_IDLE)
{
RDCWARN("Mapping buffer that hasn't been allocated");
ptr = (byte *)m_Real.glMapNamedBufferRangeEXT(buffer, offset, length, access);
record->Map.ptr = ptr;
record->Map.status = GLResourceRecord::Mapped_Write_Real;
}
else
RDCASSERT(ptr);
{
// flush explicit maps are handled particularly:
// if we're idle, we just return the backing pointer and treat it no differently to a normal write map,