From 042ebe88144e7c0fbb00e2b18e98740fca2cf260 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: Sat, 7 Dec 2024 22:49:45 -0800 Subject: [PATCH] Cleanup. --- examples/01-cubes/cubes.cpp | 2 +- examples/08-update/update.cpp | 12 +++++------ examples/32-particles/particles.cpp | 2 +- examples/43-denoise/denoise.cpp | 2 +- examples/common/debugdraw/debugdraw.cpp | 6 +++--- examples/common/entry/dialog.cpp | 2 +- examples/common/entry/entry.cpp | 4 ++-- examples/common/entry/entry_x11.cpp | 2 +- scripts/temp.bgfx.idl.inl | 4 ++-- src/bgfx.cpp | 28 ++++++++++++------------- src/bgfx.idl.inl | 4 ++-- src/bgfx_p.h | 12 +++++------ src/config.h | 4 ++-- src/dxgi.cpp | 2 +- src/glcontext_wgl.cpp | 2 +- src/renderer_d3d11.cpp | 8 +++---- src/renderer_d3d12.cpp | 18 ++++++++-------- src/renderer_d3d12.h | 2 +- src/renderer_gl.cpp | 18 ++++++++-------- src/renderer_mtl.mm | 12 +++++------ src/renderer_vk.cpp | 12 +++++------ src/renderer_vk.h | 2 +- src/shader.cpp | 6 +++--- src/shader_dxbc.cpp | 16 +++++++------- src/shader_spirv.cpp | 10 ++++----- src/vertexlayout.cpp | 10 ++++----- tools/geometryv/geometryv.cpp | 6 +++--- tools/shaderc/shaderc.cpp | 4 ++-- tools/shaderc/shaderc_metal.cpp | 2 +- tools/shaderc/shaderc_spirv.cpp | 2 +- tools/texturev/texturev.cpp | 4 ++-- 31 files changed, 110 insertions(+), 110 deletions(-) diff --git a/examples/01-cubes/cubes.cpp b/examples/01-cubes/cubes.cpp index b1bb7a933..7de41175f 100644 --- a/examples/01-cubes/cubes.cpp +++ b/examples/01-cubes/cubes.cpp @@ -120,7 +120,7 @@ static const uint64_t s_ptState[] BGFX_STATE_PT_LINESTRIP, BGFX_STATE_PT_POINTS, }; -BX_STATIC_ASSERT(BX_COUNTOF(s_ptState) == BX_COUNTOF(s_ptNames) ); +static_assert(BX_COUNTOF(s_ptState) == BX_COUNTOF(s_ptNames) ); class ExampleCubes : public entry::AppI { diff --git a/examples/08-update/update.cpp b/examples/08-update/update.cpp index 109efb0ff..ecf6bba73 100644 --- a/examples/08-update/update.cpp +++ b/examples/08-update/update.cpp @@ -77,7 +77,7 @@ static PosTexcoordVertex s_cubeVertices[] = {-1.0f, -1.0f, 1.0f, -2.0f, -2.0f, 2.0f }, { 1.0f, -1.0f, 1.0f, 2.0f, -2.0f, 2.0f }, }; -BX_STATIC_ASSERT(BX_COUNTOF(s_cubeVertices) == 28); +static_assert(BX_COUNTOF(s_cubeVertices) == 28); static const uint16_t s_cubeIndices[] = { @@ -99,7 +99,7 @@ static const uint16_t s_cubeIndices[] = 20, 22, 21, // 10 21, 22, 23, }; -BX_STATIC_ASSERT(BX_COUNTOF(s_cubeIndices) == 36); +static_assert(BX_COUNTOF(s_cubeIndices) == 36); bx::Vec3 s_faceColors[] = { @@ -295,7 +295,7 @@ public: m_textures[22] = loadTextureWithUpdate("textures/texture_compression_atci.dds"); m_textures[23] = loadTextureWithUpdate("textures/texture_compression_atce.dds"); - BX_STATIC_ASSERT(24 == BX_COUNTOF(m_textures)); + static_assert(24 == BX_COUNTOF(m_textures)); const bgfx::Caps* caps = bgfx::getCaps(); m_texture3DSupported = !!(caps->supported & BGFX_CAPS_TEXTURE_3D); @@ -754,7 +754,7 @@ public: "compute", "frameBuffer", }; - BX_STATIC_ASSERT(BX_COUNTOF(descTextureCube) == BX_COUNTOF(m_textureCube)); + static_assert(BX_COUNTOF(descTextureCube) == BX_COUNTOF(m_textureCube)); for (uint32_t ii = 0; ii < BX_COUNTOF(m_textureCube); ++ii) { @@ -847,7 +847,7 @@ public: "update\natci", "update\natce", }; - BX_STATIC_ASSERT(BX_COUNTOF(descTextures) == BX_COUNTOF(m_textures)); + static_assert(BX_COUNTOF(descTextures) == BX_COUNTOF(m_textures)); for (uint32_t ii = 0; ii < BX_COUNTOF(m_textures); ++ii) { @@ -878,7 +878,7 @@ public: "Tex3D R16F", "Tex3D R32F", }; - BX_STATIC_ASSERT(BX_COUNTOF(descTextures3d) == BX_COUNTOF(m_textures3d)); + static_assert(BX_COUNTOF(descTextures3d) == BX_COUNTOF(m_textures3d)); for (uint32_t ii = 0; ii < m_numTextures3d; ++ii) { diff --git a/examples/32-particles/particles.cpp b/examples/32-particles/particles.cpp index ae06bf74b..1a661f2c1 100644 --- a/examples/32-particles/particles.cpp +++ b/examples/32-particles/particles.cpp @@ -81,7 +81,7 @@ static const char* s_easeFuncName[] = "InOutBounce", "OutInBounce", }; -BX_STATIC_ASSERT(BX_COUNTOF(s_easeFuncName) == bx::Easing::Count); +static_assert(BX_COUNTOF(s_easeFuncName) == bx::Easing::Count); struct Emitter { diff --git a/examples/43-denoise/denoise.cpp b/examples/43-denoise/denoise.cpp index ac6fb6c2f..2216cb143 100644 --- a/examples/43-denoise/denoise.cpp +++ b/examples/43-denoise/denoise.cpp @@ -527,7 +527,7 @@ public: m_temporaryColor.m_buffer, m_currentColor.m_buffer, }; - BX_STATIC_ASSERT(BX_COUNTOF(destBuffer) == DENOISE_MAX_PASSES); + static_assert(BX_COUNTOF(destBuffer) == DENOISE_MAX_PASSES); const uint32_t denoisePasses = bx::min(DENOISE_MAX_PASSES, m_denoisePasses); diff --git a/examples/common/debugdraw/debugdraw.cpp b/examples/common/debugdraw/debugdraw.cpp index e9202bf45..8327bdba8 100644 --- a/examples/common/debugdraw/debugdraw.cpp +++ b/examples/common/debugdraw/debugdraw.cpp @@ -1505,7 +1505,7 @@ struct DebugDrawEncoderImpl } else { - BX_STATIC_ASSERT(sizeof(DdVertex) == sizeof(bx::Vec3), ""); + static_assert(sizeof(DdVertex) == sizeof(bx::Vec3), ""); uint64_t old = attrib.m_state; attrib.m_state &= ~BGFX_STATE_CULL_MASK; @@ -2241,7 +2241,7 @@ struct DebugDrawEncoderImpl static const uint32_t kCacheSize = 1024; static const uint32_t kStackSize = 16; static const uint32_t kCacheQuadSize = 1024; - BX_STATIC_ASSERT(kCacheSize >= 3, "Cache must be at least 3 elements."); + static_assert(kCacheSize >= 3, "Cache must be at least 3 elements."); DebugVertex m_cache[kCacheSize+1]; DebugUvVertex m_cacheQuad[kCacheQuadSize]; @@ -2281,7 +2281,7 @@ struct DebugDrawEncoderImpl }; static DebugDrawEncoderImpl s_dde; -BX_STATIC_ASSERT(sizeof(DebugDrawEncoderImpl) <= sizeof(DebugDrawEncoder), "Size must match"); +static_assert(sizeof(DebugDrawEncoderImpl) <= sizeof(DebugDrawEncoder), "Size must match"); void ddInit(bx::AllocatorI* _allocator) { diff --git a/examples/common/entry/dialog.cpp b/examples/common/entry/dialog.cpp index 244565c23..a6d0d4f09 100644 --- a/examples/common/entry/dialog.cpp +++ b/examples/common/entry/dialog.cpp @@ -118,7 +118,7 @@ s_getFileNameA[] = { GetOpenFileNameA, /* OFN_EXPLORER */ 0x00080000 | /* OFN_DONTADDTORECENT */ 0x02000000 | /* OFN_FILEMUSTEXIST */ 0x00001000 }, { GetSaveFileNameA, /* OFN_EXPLORER */ 0x00080000 | /* OFN_DONTADDTORECENT */ 0x02000000 }, }; -BX_STATIC_ASSERT(BX_COUNTOF(s_getFileNameA) == FileSelectionDialogType::Count); +static_assert(BX_COUNTOF(s_getFileNameA) == FileSelectionDialogType::Count); #endif #if !BX_PLATFORM_OSX diff --git a/examples/common/entry/entry.cpp b/examples/common/entry/entry.cpp index 259bf2474..0787ee18f 100644 --- a/examples/common/entry/entry.cpp +++ b/examples/common/entry/entry.cpp @@ -185,7 +185,7 @@ BX_PRAGMA_DIAGNOSTIC_POP(); "GamepadStart", "GamepadGuide", }; - BX_STATIC_ASSERT(Key::Count == BX_COUNTOF(s_keyName) ); + static_assert(Key::Count == BX_COUNTOF(s_keyName) ); const char* getName(Key::Enum _key) { @@ -455,7 +455,7 @@ BX_PRAGMA_DIAGNOSTIC_POP(); AppI::AppI(const char* _name, const char* _description, const char* _url) { - BX_STATIC_ASSERT(sizeof(AppInternal) <= sizeof(m_internal) ); + static_assert(sizeof(AppInternal) <= sizeof(m_internal) ); s_offset = BX_OFFSETOF(AppI, m_internal); AppInternal* ai = (AppInternal*)m_internal; diff --git a/examples/common/entry/entry_x11.cpp b/examples/common/entry/entry_x11.cpp index ff858742b..d71dc805a 100644 --- a/examples/common/entry/entry_x11.cpp +++ b/examples/common/entry/entry_x11.cpp @@ -81,7 +81,7 @@ namespace entry { Key::GamepadUp, Key::GamepadDown }, { Key::None, Key::None }, }; - BX_STATIC_ASSERT(BX_COUNTOF(s_translateAxis) == BX_COUNTOF(s_axisDpad) ); + static_assert(BX_COUNTOF(s_translateAxis) == BX_COUNTOF(s_axisDpad) ); struct Joystick { diff --git a/scripts/temp.bgfx.idl.inl b/scripts/temp.bgfx.idl.inl index 96f470901..0daee5741 100644 --- a/scripts/temp.bgfx.idl.inl +++ b/scripts/temp.bgfx.idl.inl @@ -13,7 +13,7 @@ */ #define BGFX_C99_ENUM_CHECK(_enum, _c99enumcount) \ - BX_STATIC_ASSERT(_enum::Count == _enum::Enum(_c99enumcount) ) + static_assert(_enum::Count == _enum::Enum(_c99enumcount) ) BGFX_C99_ENUM_CHECK(bgfx::Fatal, BGFX_FATAL_COUNT); BGFX_C99_ENUM_CHECK(bgfx::RendererType, BGFX_RENDERER_TYPE_COUNT); @@ -30,7 +30,7 @@ BGFX_C99_ENUM_CHECK(bgfx::RenderFrame, BGFX_RENDER_FRAME_COUNT); #undef BGFX_C99_ENUM_CHECK #define BGFX_C99_STRUCT_SIZE_CHECK(_cppstruct, _c99struct) \ - BX_STATIC_ASSERT(sizeof(_cppstruct) == sizeof(_c99struct) ) + static_assert(sizeof(_cppstruct) == sizeof(_c99struct) ) BGFX_C99_STRUCT_SIZE_CHECK(bgfx::Memory, bgfx_memory_t); BGFX_C99_STRUCT_SIZE_CHECK(bgfx::Transform, bgfx_transform_t); diff --git a/src/bgfx.cpp b/src/bgfx.cpp index eb08cee43..64090cb68 100644 --- a/src/bgfx.cpp +++ b/src/bgfx.cpp @@ -330,7 +330,7 @@ namespace bgfx { "VL", "VertexLayout" }, { "?", "?" }, }; - BX_STATIC_ASSERT(BX_COUNTOF(s_typeName) == Handle::Count+1, ""); + static_assert(BX_COUNTOF(s_typeName) == Handle::Count+1, ""); const Handle::TypeName& Handle::getTypeName(Handle::Enum _enum) { @@ -748,7 +748,7 @@ namespace bgfx 0xff4fe9fc, // Yellow 0xffeceeee, // White }; - BX_STATIC_ASSERT(BX_COUNTOF(s_paletteSrgb) == 16); + static_assert(BX_COUNTOF(s_paletteSrgb) == 16); static const uint32_t s_paletteLinear[] = { @@ -769,7 +769,7 @@ namespace bgfx 0xff13cff8, // Yellow 0xffd5dada // White }; - BX_STATIC_ASSERT(BX_COUNTOF(s_paletteLinear) == 16); + static_assert(BX_COUNTOF(s_paletteLinear) == 16); void blit(RendererContextI* _renderCtx, TextVideoMemBlitter& _blitter, const TextVideoMem& _mem) { @@ -948,7 +948,7 @@ namespace bgfx "mat3", "mat4", }; - BX_STATIC_ASSERT(UniformType::Count == BX_COUNTOF(s_uniformTypeName) ); + static_assert(UniformType::Count == BX_COUNTOF(s_uniformTypeName) ); const char* getUniformTypeName(UniformType::Enum _enum) { @@ -1824,7 +1824,7 @@ namespace bgfx "LineStrip", "Points", }; - BX_STATIC_ASSERT(Topology::Count == BX_COUNTOF(s_topologyName) ); + static_assert(Topology::Count == BX_COUNTOF(s_topologyName) ); const char* getName(Topology::Enum _topology) { @@ -2656,7 +2656,7 @@ namespace bgfx { gl::rendererCreate, gl::rendererDestroy, BGFX_RENDERER_OPENGL_NAME, !!BGFX_CONFIG_RENDERER_OPENGL }, // OpenGL { vk::rendererCreate, vk::rendererDestroy, BGFX_RENDERER_VULKAN_NAME, !!BGFX_CONFIG_RENDERER_VULKAN }, // Vulkan }; - BX_STATIC_ASSERT(BX_COUNTOF(s_rendererCreator) == RendererType::Count); + static_assert(BX_COUNTOF(s_rendererCreator) == RendererType::Count); bool windowsVersionIs(Condition::Enum _op, uint32_t _version, uint32_t _build) { @@ -5612,7 +5612,7 @@ extern "C" #endif // BGFX_CONFIG_PREFER_DISCRETE_GPU #define BGFX_TEXTURE_FORMAT_BIMG(_fmt) \ - BX_STATIC_ASSERT(uint32_t(bgfx::TextureFormat::_fmt) == uint32_t(bimg::TextureFormat::_fmt) ) + static_assert(uint32_t(bgfx::TextureFormat::_fmt) == uint32_t(bimg::TextureFormat::_fmt) ) BGFX_TEXTURE_FORMAT_BIMG(BC1); BGFX_TEXTURE_FORMAT_BIMG(BC2); @@ -5718,29 +5718,29 @@ BGFX_TEXTURE_FORMAT_BIMG(Count); #define FLAGS_MASK_TEST(_flags, _mask) ( (_flags) == ( (_flags) & (_mask) ) ) -BX_STATIC_ASSERT(FLAGS_MASK_TEST(0 +static_assert(FLAGS_MASK_TEST(0 | BGFX_SAMPLER_INTERNAL_DEFAULT | BGFX_SAMPLER_INTERNAL_SHARED , BGFX_SAMPLER_RESERVED_MASK ) ); -BX_STATIC_ASSERT(FLAGS_MASK_TEST(0 +static_assert(FLAGS_MASK_TEST(0 | BGFX_RESET_INTERNAL_FORCE , BGFX_RESET_RESERVED_MASK ) ); -BX_STATIC_ASSERT(FLAGS_MASK_TEST(0 +static_assert(FLAGS_MASK_TEST(0 | BGFX_STATE_INTERNAL_SCISSOR | BGFX_STATE_INTERNAL_OCCLUSION_QUERY , BGFX_STATE_RESERVED_MASK ) ); -BX_STATIC_ASSERT(FLAGS_MASK_TEST(0 +static_assert(FLAGS_MASK_TEST(0 | BGFX_SUBMIT_INTERNAL_OCCLUSION_VISIBLE , BGFX_SUBMIT_INTERNAL_RESERVED_MASK ) ); -BX_STATIC_ASSERT( (0 +static_assert( (0 | BGFX_STATE_ALPHA_REF_MASK | BGFX_STATE_BLEND_ALPHA_TO_COVERAGE | BGFX_STATE_BLEND_EQUATION_MASK @@ -5774,9 +5774,9 @@ BX_STATIC_ASSERT( (0 ^ BGFX_STATE_WRITE_MASK ) ); -BX_STATIC_ASSERT(FLAGS_MASK_TEST(BGFX_CAPS_TEXTURE_COMPARE_LEQUAL, BGFX_CAPS_TEXTURE_COMPARE_ALL) ); +static_assert(FLAGS_MASK_TEST(BGFX_CAPS_TEXTURE_COMPARE_LEQUAL, BGFX_CAPS_TEXTURE_COMPARE_ALL) ); -BX_STATIC_ASSERT( (0 +static_assert( (0 | BGFX_CAPS_ALPHA_TO_COVERAGE | BGFX_CAPS_BLEND_INDEPENDENT | BGFX_CAPS_COMPUTE diff --git a/src/bgfx.idl.inl b/src/bgfx.idl.inl index 820b1a2df..d6f46038a 100644 --- a/src/bgfx.idl.inl +++ b/src/bgfx.idl.inl @@ -13,7 +13,7 @@ */ #define BGFX_C99_ENUM_CHECK(_enum, _c99enumcount) \ - BX_STATIC_ASSERT(_enum::Count == _enum::Enum(_c99enumcount) ) + static_assert(_enum::Count == _enum::Enum(_c99enumcount) ) BGFX_C99_ENUM_CHECK(bgfx::Fatal, BGFX_FATAL_COUNT); BGFX_C99_ENUM_CHECK(bgfx::RendererType, BGFX_RENDERER_TYPE_COUNT); @@ -30,7 +30,7 @@ BGFX_C99_ENUM_CHECK(bgfx::RenderFrame, BGFX_RENDER_FRAME_COUNT); #undef BGFX_C99_ENUM_CHECK #define BGFX_C99_STRUCT_SIZE_CHECK(_cppstruct, _c99struct) \ - BX_STATIC_ASSERT(sizeof(_cppstruct) == sizeof(_c99struct) ) + static_assert(sizeof(_cppstruct) == sizeof(_c99struct) ) BGFX_C99_STRUCT_SIZE_CHECK(bgfx::Memory, bgfx_memory_t); BGFX_C99_STRUCT_SIZE_CHECK(bgfx::Transform, bgfx_transform_t); diff --git a/src/bgfx_p.h b/src/bgfx_p.h index ec9e26c9b..c07bf9ef0 100644 --- a/src/bgfx_p.h +++ b/src/bgfx_p.h @@ -1089,9 +1089,9 @@ namespace bgfx constexpr uint8_t kSortKeyComputeProgramShift = kSortKeyComputeSeqShift - BGFX_CONFIG_SORT_KEY_NUM_BITS_PROGRAM; constexpr uint64_t kSortKeyComputeProgramMask = uint64_t(BGFX_CONFIG_MAX_PROGRAMS-1)<