From 403b69db7876bc7269f546273bba57c40d2b137e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=80=D0=B0=D0=BD=D0=B8=D0=BC=D0=B8=D1=80=20=D0=9A?= =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=9F=D0=B8=D1=9B?= Date: Fri, 10 Sep 2021 23:26:09 -0700 Subject: [PATCH] Cleanup. --- include/bgfx/embedded_shader.h | 131 +++++++++++++++++---------------- 1 file changed, 66 insertions(+), 65 deletions(-) diff --git a/include/bgfx/embedded_shader.h b/include/bgfx/embedded_shader.h index 6a9cd7d07..fa5bc2074 100644 --- a/include/bgfx/embedded_shader.h +++ b/include/bgfx/embedded_shader.h @@ -19,115 +19,116 @@ #define BGFX_EMBEDDED_SHADER_SPIRV(...) #define BGFX_PLATFORM_SUPPORTS_DX9BC (0 \ - || BX_PLATFORM_WINDOWS \ - ) + || BX_PLATFORM_WINDOWS \ + ) #define BGFX_PLATFORM_SUPPORTS_DXBC (0 \ - || BX_PLATFORM_WINDOWS \ - || BX_PLATFORM_WINRT \ - || BX_PLATFORM_XBOXONE \ - ) + || BX_PLATFORM_WINDOWS \ + || BX_PLATFORM_WINRT \ + || BX_PLATFORM_XBOXONE \ + ) #define BGFX_PLATFORM_SUPPORTS_PSSL (0 \ - || BX_PLATFORM_PS4 \ - || BX_PLATFORM_PS5 \ - ) + || BX_PLATFORM_PS4 \ + || BX_PLATFORM_PS5 \ + ) #define BGFX_PLATFORM_SUPPORTS_ESSL (0 \ - || BX_PLATFORM_ANDROID \ - || BX_PLATFORM_EMSCRIPTEN \ - || BX_PLATFORM_IOS \ - || BX_PLATFORM_LINUX \ - || BX_PLATFORM_OSX \ - || BX_PLATFORM_RPI \ - || BX_PLATFORM_WINDOWS \ - ) + || BX_PLATFORM_ANDROID \ + || BX_PLATFORM_EMSCRIPTEN \ + || BX_PLATFORM_IOS \ + || BX_PLATFORM_LINUX \ + || BX_PLATFORM_OSX \ + || BX_PLATFORM_RPI \ + || BX_PLATFORM_WINDOWS \ + ) #define BGFX_PLATFORM_SUPPORTS_GLSL (0 \ - || BX_PLATFORM_BSD \ - || BX_PLATFORM_LINUX \ - || BX_PLATFORM_OSX \ - || BX_PLATFORM_WINDOWS \ - ) + || BX_PLATFORM_BSD \ + || BX_PLATFORM_LINUX \ + || BX_PLATFORM_OSX \ + || BX_PLATFORM_WINDOWS \ + ) #define BGFX_PLATFORM_SUPPORTS_METAL (0 \ - || BX_PLATFORM_IOS \ - || BX_PLATFORM_OSX \ - ) + || BX_PLATFORM_IOS \ + || BX_PLATFORM_OSX \ + ) #define BGFX_PLATFORM_SUPPORTS_NVN (0 \ - || BX_PLATFORM_NX \ - ) + || BX_PLATFORM_NX \ + ) #define BGFX_PLATFORM_SUPPORTS_SPIRV (0 \ - || BX_PLATFORM_ANDROID \ - || BX_PLATFORM_EMSCRIPTEN \ - || BX_PLATFORM_LINUX \ - || BX_PLATFORM_WINDOWS \ - || BX_PLATFORM_OSX \ - ) + || BX_PLATFORM_ANDROID \ + || BX_PLATFORM_EMSCRIPTEN \ + || BX_PLATFORM_LINUX \ + || BX_PLATFORM_WINDOWS \ + || BX_PLATFORM_OSX \ + ) #if BGFX_PLATFORM_SUPPORTS_DX9BC # undef BGFX_EMBEDDED_SHADER_DX9BC # define BGFX_EMBEDDED_SHADER_DX9BC(_renderer, _name) \ - { _renderer, BX_CONCATENATE(_name, _dx9 ), BX_COUNTOF(BX_CONCATENATE(_name, _dx9 ) ) }, + { _renderer, BX_CONCATENATE(_name, _dx9 ), BX_COUNTOF(BX_CONCATENATE(_name, _dx9 ) ) }, #endif // BGFX_PLATFORM_SUPPORTS_DX9BC #if BGFX_PLATFORM_SUPPORTS_DXBC # undef BGFX_EMBEDDED_SHADER_DXBC # define BGFX_EMBEDDED_SHADER_DXBC(_renderer, _name) \ - { _renderer, BX_CONCATENATE(_name, _dx11), BX_COUNTOF(BX_CONCATENATE(_name, _dx11) ) }, + { _renderer, BX_CONCATENATE(_name, _dx11), BX_COUNTOF(BX_CONCATENATE(_name, _dx11) ) }, #endif // BGFX_PLATFORM_SUPPORTS_DXBC #if BGFX_PLATFORM_SUPPORTS_PSSL # undef BGFX_EMBEDDED_SHADER_PSSL # define BGFX_EMBEDDED_SHADER_PSSL(_renderer, _name) \ - { _renderer, BX_CONCATENATE(_name, _pssl), BX_CONCATENATE(_name, _pssl_size) }, + { _renderer, BX_CONCATENATE(_name, _pssl), BX_CONCATENATE(_name, _pssl_size) }, #endif // BGFX_PLATFORM_SUPPORTS_PSSL #if BGFX_PLATFORM_SUPPORTS_ESSL # undef BGFX_EMBEDDED_SHADER_ESSL # define BGFX_EMBEDDED_SHADER_ESSL(_renderer, _name) \ - { _renderer, BX_CONCATENATE(_name, _essl), BX_COUNTOF(BX_CONCATENATE(_name, _essl) ) }, + { _renderer, BX_CONCATENATE(_name, _essl), BX_COUNTOF(BX_CONCATENATE(_name, _essl) ) }, #endif // BGFX_PLATFORM_SUPPORTS_ESSL #if BGFX_PLATFORM_SUPPORTS_GLSL # undef BGFX_EMBEDDED_SHADER_GLSL # define BGFX_EMBEDDED_SHADER_GLSL(_renderer, _name) \ - { _renderer, BX_CONCATENATE(_name, _glsl), BX_COUNTOF(BX_CONCATENATE(_name, _glsl) ) }, + { _renderer, BX_CONCATENATE(_name, _glsl), BX_COUNTOF(BX_CONCATENATE(_name, _glsl) ) }, #endif // BGFX_PLATFORM_SUPPORTS_GLSL #if BGFX_PLATFORM_SUPPORTS_SPIRV # undef BGFX_EMBEDDED_SHADER_SPIRV # define BGFX_EMBEDDED_SHADER_SPIRV(_renderer, _name) \ - { _renderer, BX_CONCATENATE(_name, _spv), BX_COUNTOF(BX_CONCATENATE(_name, _spv) ) }, + { _renderer, BX_CONCATENATE(_name, _spv), BX_COUNTOF(BX_CONCATENATE(_name, _spv) ) }, #endif // BGFX_PLATFORM_SUPPORTS_SPIRV #if BGFX_PLATFORM_SUPPORTS_METAL # undef BGFX_EMBEDDED_SHADER_METAL # define BGFX_EMBEDDED_SHADER_METAL(_renderer, _name) \ - { _renderer, BX_CONCATENATE(_name, _mtl), BX_COUNTOF(BX_CONCATENATE(_name, _mtl) ) }, + { _renderer, BX_CONCATENATE(_name, _mtl), BX_COUNTOF(BX_CONCATENATE(_name, _mtl) ) }, #endif // BGFX_PLATFORM_SUPPORTS_METAL -#define BGFX_EMBEDDED_SHADER(_name) \ - { \ - #_name, \ - { \ - BGFX_EMBEDDED_SHADER_DX9BC(bgfx::RendererType::Direct3D9, _name) \ - BGFX_EMBEDDED_SHADER_DXBC (bgfx::RendererType::Direct3D11, _name) \ - BGFX_EMBEDDED_SHADER_DXBC (bgfx::RendererType::Direct3D12, _name) \ - BGFX_EMBEDDED_SHADER_PSSL (bgfx::RendererType::Gnm, _name) \ - BGFX_EMBEDDED_SHADER_METAL(bgfx::RendererType::Metal, _name) \ - BGFX_EMBEDDED_SHADER_NVN (bgfx::RendererType::Nvn, _name) \ - BGFX_EMBEDDED_SHADER_ESSL (bgfx::RendererType::OpenGLES, _name) \ - BGFX_EMBEDDED_SHADER_GLSL (bgfx::RendererType::OpenGL, _name) \ - BGFX_EMBEDDED_SHADER_SPIRV(bgfx::RendererType::Vulkan, _name) \ - BGFX_EMBEDDED_SHADER_SPIRV(bgfx::RendererType::WebGPU, _name) \ - { bgfx::RendererType::Noop, (const uint8_t*)"VSH\x5\x0\x0\x0\x0\x0\x0", 10 }, \ - { bgfx::RendererType::Count, NULL, 0 } \ - } \ - } +#define BGFX_EMBEDDED_SHADER(_name) \ + { \ + #_name, \ + { \ + BGFX_EMBEDDED_SHADER_PSSL (bgfx::RendererType::Agc, _name) \ + BGFX_EMBEDDED_SHADER_DX9BC(bgfx::RendererType::Direct3D9, _name) \ + BGFX_EMBEDDED_SHADER_DXBC (bgfx::RendererType::Direct3D11, _name) \ + BGFX_EMBEDDED_SHADER_DXBC (bgfx::RendererType::Direct3D12, _name) \ + BGFX_EMBEDDED_SHADER_PSSL (bgfx::RendererType::Gnm, _name) \ + BGFX_EMBEDDED_SHADER_METAL(bgfx::RendererType::Metal, _name) \ + BGFX_EMBEDDED_SHADER_NVN (bgfx::RendererType::Nvn, _name) \ + BGFX_EMBEDDED_SHADER_ESSL (bgfx::RendererType::OpenGLES, _name) \ + BGFX_EMBEDDED_SHADER_GLSL (bgfx::RendererType::OpenGL, _name) \ + BGFX_EMBEDDED_SHADER_SPIRV(bgfx::RendererType::Vulkan, _name) \ + BGFX_EMBEDDED_SHADER_SPIRV(bgfx::RendererType::WebGPU, _name) \ + { bgfx::RendererType::Noop, (const uint8_t*)"VSH\x5\x0\x0\x0\x0\x0\x0", 10 }, \ + { bgfx::RendererType::Count, NULL, 0 } \ + } \ + } -#define BGFX_EMBEDDED_SHADER_END() \ - { \ - NULL, \ - { \ - { bgfx::RendererType::Count, NULL, 0 } \ - } \ - } +#define BGFX_EMBEDDED_SHADER_END() \ + { \ + NULL, \ + { \ + { bgfx::RendererType::Count, NULL, 0 } \ + } \ + } namespace bgfx {