lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-07-10 01:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

32-bit compile fixes

Browse Source
This commit is contained in:
Baldur Karlsson
2018-03-12 17:11:11 +00:00
parent 4992e09918
commit 07dba4732f
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/dxgi/dxgi_hooks.cpp
+2 -2
View File
@@ -54,7 +54,7 @@ struct RenderDocAnalysis : IDXGraphicsAnalysis
unsigned int m_iRefcount = 0;
// IDXGraphicsAnalysis
void BeginCapture()
void STDMETHODCALLTYPE BeginCapture()
{
void *dev = NULL, *wnd = NULL;
RenderDoc::Inst().GetActiveWindow(dev, wnd);
@@ -62,7 +62,7 @@ struct RenderDocAnalysis : IDXGraphicsAnalysis
RenderDoc::Inst().StartFrameCapture(dev, wnd);
}
void EndCapture()
void STDMETHODCALLTYPE EndCapture()
{
void *dev = NULL, *wnd = NULL;
RenderDoc::Inst().GetActiveWindow(dev, wnd);
renderdoc/driver/gl/gl_debug.cpp
+1 -1
View File
@@ -700,7 +700,7 @@ void GLReplay::InitDebugData()
gl.glBindTransformFeedback(eGL_TRANSFORM_FEEDBACK, DebugData.feedbackObj);
gl.glBindBuffer(eGL_TRANSFORM_FEEDBACK_BUFFER, DebugData.feedbackBuffer);
gl.glNamedBufferDataEXT(DebugData.feedbackBuffer, DebugData.feedbackBufferSize, NULL,
gl.glNamedBufferDataEXT(DebugData.feedbackBuffer, (GLsizeiptr)DebugData.feedbackBufferSize, NULL,
eGL_DYNAMIC_READ);
gl.glBindBufferBase(eGL_TRANSFORM_FEEDBACK_BUFFER, 0, DebugData.feedbackBuffer);
gl.glBindTransformFeedback(eGL_TRANSFORM_FEEDBACK, 0);
renderdoc/driver/gl/gl_postvs.cpp
+21 -6
View File
@@ -376,8 +376,13 @@ void GLReplay::InitPostVSBuffers(uint32_t eventId)
DebugData.feedbackBufferSize *= 2;
RDCWARN("Resizing xfb buffer from %llu to %llu for output", oldSize,
DebugData.feedbackBufferSize);
gl.glNamedBufferDataEXT(DebugData.feedbackBuffer, DebugData.feedbackBufferSize, NULL,
eGL_DYNAMIC_READ);
if(DebugData.feedbackBufferSize > INTPTR_MAX)
{
RDCERR("Too much data generated");
DebugData.feedbackBufferSize = INTPTR_MAX;
}
gl.glNamedBufferDataEXT(DebugData.feedbackBuffer, (GLsizeiptr)DebugData.feedbackBufferSize,
NULL, eGL_DYNAMIC_READ);
}
// need to rebind this here because of an AMD bug that seems to ignore the buffer
@@ -490,8 +495,13 @@ void GLReplay::InitPostVSBuffers(uint32_t eventId)
DebugData.feedbackBufferSize *= 2;
RDCWARN("Resizing xfb buffer from %llu to %llu for output", oldSize,
DebugData.feedbackBufferSize);
gl.glNamedBufferDataEXT(DebugData.feedbackBuffer, DebugData.feedbackBufferSize, NULL,
eGL_DYNAMIC_READ);
if(DebugData.feedbackBufferSize > INTPTR_MAX)
{
RDCERR("Too much data generated");
DebugData.feedbackBufferSize = INTPTR_MAX;
}
gl.glNamedBufferDataEXT(DebugData.feedbackBuffer, (GLsizeiptr)DebugData.feedbackBufferSize,
NULL, eGL_DYNAMIC_READ);
}
// need to rebind this here because of an AMD bug that seems to ignore the buffer
@@ -1041,8 +1051,13 @@ void GLReplay::InitPostVSBuffers(uint32_t eventId)
DebugData.feedbackBufferSize *= 2;
RDCWARN("Conservatively resizing xfb buffer from %llu to %llu for output", oldSize,
DebugData.feedbackBufferSize);
gl.glNamedBufferDataEXT(DebugData.feedbackBuffer, DebugData.feedbackBufferSize, NULL,
eGL_DYNAMIC_READ);
if(DebugData.feedbackBufferSize > INTPTR_MAX)
{
RDCERR("Too much data generated");
DebugData.feedbackBufferSize = INTPTR_MAX;
}
gl.glNamedBufferDataEXT(DebugData.feedbackBuffer, (GLsizeiptr)DebugData.feedbackBufferSize,
NULL, eGL_DYNAMIC_READ);
}
GLenum idxType = eGL_UNSIGNED_BYTE;