From eeb5fe7c02a5c0afffb01cf8e05a35a89188b8d2 Mon Sep 17 00:00:00 2001 From: Pablo Escobar Date: Fri, 3 Apr 2020 00:40:00 +0200 Subject: [PATCH] Don't double-quote profiler literals --- src/renderer_d3d11.h | 24 ++++++++++++------------ src/renderer_d3d12.h | 4 ++-- src/renderer_d3d9.h | 24 ++++++++++++------------ src/renderer_gl.h | 4 ++-- src/renderer_mtl.h | 6 +++--- src/renderer_vk.cpp | 6 +++--- src/renderer_vk.h | 4 ++-- 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/renderer_d3d11.h b/src/renderer_d3d11.h index 64bf090dd..1f470441a 100644 --- a/src/renderer_d3d11.h +++ b/src/renderer_d3d11.h @@ -54,22 +54,22 @@ BX_PRAGMA_DIAGNOSTIC_POP() | BGFX_STATE_DEPTH_TEST_MASK \ ) -#define BGFX_D3D11_PROFILER_BEGIN(_view, _abgr) \ - BX_MACRO_BLOCK_BEGIN \ - PIX_BEGINEVENT(_abgr, s_viewNameW[_view]); \ - BGFX_PROFILER_BEGIN(s_viewName[view], _abgr); \ +#define BGFX_D3D11_PROFILER_BEGIN(_view, _abgr) \ + BX_MACRO_BLOCK_BEGIN \ + PIX_BEGINEVENT(_abgr, s_viewNameW[_view]); \ + BGFX_PROFILER_BEGIN(s_viewName[view], _abgr); \ BX_MACRO_BLOCK_END -#define BGFX_D3D11_PROFILER_BEGIN_LITERAL(_name, _abgr) \ - BX_MACRO_BLOCK_BEGIN \ - PIX_BEGINEVENT(_abgr, L"" # _name); \ - BGFX_PROFILER_BEGIN_LITERAL("" # _name, _abgr); \ +#define BGFX_D3D11_PROFILER_BEGIN_LITERAL(_name, _abgr) \ + BX_MACRO_BLOCK_BEGIN \ + PIX_BEGINEVENT(_abgr, L"" _name); \ + BGFX_PROFILER_BEGIN_LITERAL("" _name, _abgr); \ BX_MACRO_BLOCK_END -#define BGFX_D3D11_PROFILER_END() \ - BX_MACRO_BLOCK_BEGIN \ - BGFX_PROFILER_END(); \ - PIX_ENDEVENT(); \ +#define BGFX_D3D11_PROFILER_END() \ + BX_MACRO_BLOCK_BEGIN \ + BGFX_PROFILER_END(); \ + PIX_ENDEVENT(); \ BX_MACRO_BLOCK_END namespace bgfx { namespace d3d11 diff --git a/src/renderer_d3d12.h b/src/renderer_d3d12.h index 2e5a5b292..df95c1b9f 100644 --- a/src/renderer_d3d12.h +++ b/src/renderer_d3d12.h @@ -90,8 +90,8 @@ extern "C" uint64_t WINAPI bgfx_PIXEventsReplaceBlock(bool _g #define BGFX_D3D12_PROFILER_BEGIN_LITERAL(_name, _abgr) \ BX_MACRO_BLOCK_BEGIN \ - PIX3_BEGINEVENT(m_commandList, _abgr, "" # _name); \ - BGFX_PROFILER_BEGIN_LITERAL("" # _name, _abgr); \ + PIX3_BEGINEVENT(m_commandList, _abgr, "" _name); \ + BGFX_PROFILER_BEGIN_LITERAL("" _name, _abgr); \ BX_MACRO_BLOCK_END #define BGFX_D3D12_PROFILER_END() \ diff --git a/src/renderer_d3d9.h b/src/renderer_d3d9.h index 627e8cde7..312b5b276 100644 --- a/src/renderer_d3d9.h +++ b/src/renderer_d3d9.h @@ -25,22 +25,22 @@ #include "renderer_d3d.h" #include "nvapi.h" -#define BGFX_D3D9_PROFILER_BEGIN(_view, _abgr) \ - BX_MACRO_BLOCK_BEGIN \ - PIX_BEGINEVENT(_abgr, s_viewNameW[_view]); \ - BGFX_PROFILER_BEGIN(s_viewName[view], _abgr); \ +#define BGFX_D3D9_PROFILER_BEGIN(_view, _abgr) \ + BX_MACRO_BLOCK_BEGIN \ + PIX_BEGINEVENT(_abgr, s_viewNameW[_view]); \ + BGFX_PROFILER_BEGIN(s_viewName[view], _abgr); \ BX_MACRO_BLOCK_END -#define BGFX_D3D9_PROFILER_BEGIN_LITERAL(_name, _abgr) \ - BX_MACRO_BLOCK_BEGIN \ - PIX_BEGINEVENT(_abgr, L"" # _name); \ - BGFX_PROFILER_BEGIN_LITERAL("" # _name, _abgr); \ +#define BGFX_D3D9_PROFILER_BEGIN_LITERAL(_name, _abgr) \ + BX_MACRO_BLOCK_BEGIN \ + PIX_BEGINEVENT(_abgr, L"" _name); \ + BGFX_PROFILER_BEGIN_LITERAL("" _name, _abgr); \ BX_MACRO_BLOCK_END -#define BGFX_D3D9_PROFILER_END() \ - BX_MACRO_BLOCK_BEGIN \ - BGFX_PROFILER_END(); \ - PIX_ENDEVENT(); \ +#define BGFX_D3D9_PROFILER_END() \ + BX_MACRO_BLOCK_BEGIN \ + BGFX_PROFILER_END(); \ + PIX_ENDEVENT(); \ BX_MACRO_BLOCK_END namespace bgfx { namespace d3d9 diff --git a/src/renderer_gl.h b/src/renderer_gl.h index 920b0bae5..baa121593 100644 --- a/src/renderer_gl.h +++ b/src/renderer_gl.h @@ -40,8 +40,8 @@ #define BGFX_GL_PROFILER_BEGIN_LITERAL(_name, _abgr) \ BX_MACRO_BLOCK_BEGIN \ - GL_CHECK(glPushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 0, -1, "" # _name) ); \ - BGFX_PROFILER_BEGIN_LITERAL("" # _name, _abgr); \ + GL_CHECK(glPushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 0, -1, "" _name) ); \ + BGFX_PROFILER_BEGIN_LITERAL("" _name, _abgr); \ BX_MACRO_BLOCK_END #define BGFX_GL_PROFILER_END() \ diff --git a/src/renderer_mtl.h b/src/renderer_mtl.h index 8c47406da..5e03be36c 100644 --- a/src/renderer_mtl.h +++ b/src/renderer_mtl.h @@ -23,9 +23,9 @@ BGFX_PROFILER_BEGIN(s_viewName[view], _abgr); \ BX_MACRO_BLOCK_END -#define BGFX_MTL_PROFILER_BEGIN_LITERAL(_name, _abgr) \ - BX_MACRO_BLOCK_BEGIN \ - BGFX_PROFILER_BEGIN_LITERAL("" # _name, _abgr); \ +#define BGFX_MTL_PROFILER_BEGIN_LITERAL(_name, _abgr) \ + BX_MACRO_BLOCK_BEGIN \ + BGFX_PROFILER_BEGIN_LITERAL("" _name, _abgr); \ BX_MACRO_BLOCK_END #define BGFX_MTL_PROFILER_END() \ diff --git a/src/renderer_vk.cpp b/src/renderer_vk.cpp index 0ab8a8972..0fb89d8bd 100644 --- a/src/renderer_vk.cpp +++ b/src/renderer_vk.cpp @@ -5690,7 +5690,7 @@ VK_DESTROY BX_UNUSED(_render, _clearQuad, _textVideoMemBlitter); m_commandBuffer = beginNewCommand(); - BGFX_VK_PROFILER_BEGIN_LITERAL(rendererSubmit, kColorView); + BGFX_VK_PROFILER_BEGIN_LITERAL("rendererSubmit", kColorView); submitCommandAndWait(m_commandBuffer); m_commandBuffer = VK_NULL_HANDLE; @@ -6490,7 +6490,7 @@ BX_UNUSED(presentMin, presentMax); if (_render->m_debug & (BGFX_DEBUG_IFH|BGFX_DEBUG_STATS) ) { - BGFX_VK_PROFILER_BEGIN_LITERAL(debugstats, kColorFrame); + BGFX_VK_PROFILER_BEGIN_LITERAL("debugstats", kColorFrame); // m_needPresent = true; TextVideoMem& tvm = m_textVideoMem; @@ -6643,7 +6643,7 @@ BX_UNUSED(presentMin, presentMax); } else if (_render->m_debug & BGFX_DEBUG_TEXT) { - BGFX_VK_PROFILER_BEGIN_LITERAL(debugtext, kColorFrame); + BGFX_VK_PROFILER_BEGIN_LITERAL("debugtext", kColorFrame); blit(this, _textVideoMemBlitter, _render->m_textVideoMem); diff --git a/src/renderer_vk.h b/src/renderer_vk.h index a53b380e2..9e883231d 100644 --- a/src/renderer_vk.h +++ b/src/renderer_vk.h @@ -252,14 +252,14 @@ VkDebugUtilsLabelEXT dul; \ dul.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT; \ dul.pNext = NULL; \ - dul.pLabelName = "" # _name; \ + dul.pLabelName = "" _name; \ dul.color[0] = ((_abgr >> 24) & 0xff) / 255.0f; \ dul.color[1] = ((_abgr >> 16) & 0xff) / 255.0f; \ dul.color[2] = ((_abgr >> 8) & 0xff) / 255.0f; \ dul.color[3] = ((_abgr >> 0) & 0xff) / 255.0f; \ vkCmdBeginDebugUtilsLabelEXT(m_commandBuffer, &dul); \ } \ - BGFX_PROFILER_BEGIN_LITERAL("" # _name, _abgr); \ + BGFX_PROFILER_BEGIN_LITERAL("" _name, _abgr); \ BX_MACRO_BLOCK_END #define BGFX_VK_PROFILER_END() \