scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-11-28 18:45:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #605 from jpcy/amalgamated-macro-redefinition

Browse source 
Fixed macro redefinitions when using amalgamated.cpp
This commit is contained in:
Branimir Karadžić 2015-12-16 23:07:33 -08:00
commit 98b54dffd2
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/renderer_d3d11.cpp
View file

@ -5728,6 +5728,12 @@ BX_PRAGMA_DIAGNOSTIC_POP();
} }
} /* namespace d3d11 */ } // namespace bgfx } /* 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 #else
namespace bgfx { namespace d3d11 namespace bgfx { namespace d3d11

6
src/renderer_gl.cpp
View file

@ -6558,6 +6558,12 @@ namespace bgfx { namespace gl
} }
} } // namespace bgfx } } // 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 #else
namespace bgfx { namespace gl namespace bgfx { namespace gl