lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 18:10:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compile fix for gcc (or others where 'and'/'or' are keywords)

Browse Source
This commit is contained in:
baldurk
2014-09-09 22:57:07 +01:00
parent 03b6e01d1b
commit b8af0fa144
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/core/core.h
+1 -1
View File
@@ -231,7 +231,7 @@ class RenderDoc
void TriggerCapture() { m_Cap = true; }
uint32_t GetOverlayBits() { return m_Overlay; }
void MaskOverlayBits(uint32_t and, uint32_t or) { m_Overlay = (m_Overlay & and) | or; }
void MaskOverlayBits(uint32_t And, uint32_t Or) { m_Overlay = (m_Overlay & And) | Or; }
void QueueCapture(uint32_t frameNumber) { m_QueuedFrameCaptures.insert(frameNumber); }
renderdoc/replay/entry_points.cpp
+2 -2
View File
@@ -231,9 +231,9 @@ uint32_t RENDERDOC_CC RENDERDOC_GetOverlayBits()
}
extern "C" RENDERDOC_API
void RENDERDOC_CC RENDERDOC_MaskOverlayBits(uint32_t and, uint32_t or)
void RENDERDOC_CC RENDERDOC_MaskOverlayBits(uint32_t And, uint32_t Or)
{
RenderDoc::Inst().MaskOverlayBits(and, or);
RenderDoc::Inst().MaskOverlayBits(And, Or);
}
extern "C" RENDERDOC_API
renderdoc/replay/renderdoc.h
+2 -2
View File
@@ -244,8 +244,8 @@ typedef bool (RENDERDOC_CC *pRENDERDOC_EndFrameCapture)(void *wndHandle);
extern "C" RENDERDOC_API uint32_t RENDERDOC_CC RENDERDOC_GetOverlayBits();
typedef uint32_t (RENDERDOC_CC *pRENDERDOC_GetOverlayBits)();
extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_MaskOverlayBits(uint32_t and, uint32_t or);
typedef void (RENDERDOC_CC *pRENDERDOC_MaskOverlayBits)(uint32_t and, uint32_t or);
extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_MaskOverlayBits(uint32_t And, uint32_t Or);
typedef void (RENDERDOC_CC *pRENDERDOC_MaskOverlayBits)(uint32_t And, uint32_t Or);
//////////////////////////////////////////////////////////////////////////
// Remote access and control