From adef759e53d10109d4a445b193fdbbd210fd2535 Mon Sep 17 00:00:00 2001 From: Jonathan Young Date: Thu, 17 Dec 2015 17:03:10 +1000 Subject: [PATCH] Fixed macro redefinitions when using amalgamated.cpp --- src/renderer_d3d11.cpp | 6 ++++++ src/renderer_gl.cpp | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/renderer_d3d11.cpp b/src/renderer_d3d11.cpp index b296f53d..7b1619e8 100644 --- a/src/renderer_d3d11.cpp +++ b/src/renderer_d3d11.cpp @@ -5728,6 +5728,12 @@ BX_PRAGMA_DIAGNOSTIC_POP(); } } /* namespace d3d11 */ } // namespace bgfx +#undef BGFX_GPU_PROFILER_BIND +#undef BGFX_GPU_PROFILER_UNBIND +#undef BGFX_GPU_PROFILER_BEGIN +#undef BGFX_GPU_PROFILER_BEGIN_DYNAMIC +#undef BGFX_GPU_PROFILER_END + #else namespace bgfx { namespace d3d11 diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp index 90068030..2f663dea 100644 --- a/src/renderer_gl.cpp +++ b/src/renderer_gl.cpp @@ -6558,6 +6558,12 @@ namespace bgfx { namespace gl } } } // namespace bgfx +#undef BGFX_GPU_PROFILER_BIND +#undef BGFX_GPU_PROFILER_UNBIND +#undef BGFX_GPU_PROFILER_BEGIN +#undef BGFX_GPU_PROFILER_BEGIN_DYNAMIC +#undef BGFX_GPU_PROFILER_END + #else namespace bgfx { namespace gl