diff --git a/examples/42-bunnylod/bunnylod.cpp b/examples/42-bunnylod/bunnylod.cpp index bf021a7aa76..091be4466e1 100644 --- a/examples/42-bunnylod/bunnylod.cpp +++ b/examples/42-bunnylod/bunnylod.cpp @@ -68,11 +68,15 @@ class ExampleBunnyLOD : public entry::AppI static void remapIndices(uint32_t* _indices, uint32_t _num) { uint32_t target = 0; - for (uint32_t i = 0; i < _num; i++) { + for (uint32_t i = 0; i < _num; i++) + { uint32_t map = _indices[i]; - if (i != map) { + if (i != map) + { _indices[i] = _indices[map]; - } else { + } + else + { _indices[i] = target; ++target; } diff --git a/examples/common/entry/entry_glfw.cpp b/examples/common/entry/entry_glfw.cpp index f667ef54716..a5afbe0b131 100644 --- a/examples/common/entry/entry_glfw.cpp +++ b/examples/common/entry/entry_glfw.cpp @@ -44,7 +44,8 @@ namespace entry if (glfwGetPlatform() == GLFW_PLATFORM_WAYLAND) { return glfwGetWaylandWindow(_window); - } else + } + else { return (void*)(uintptr_t)glfwGetX11Window(_window); } @@ -838,7 +839,8 @@ namespace entry if (glfwGetPlatform() == GLFW_PLATFORM_WAYLAND) { return glfwGetWaylandDisplay(); - } else + } + else { return glfwGetX11Display(); } @@ -853,7 +855,8 @@ namespace entry if (glfwGetPlatform() == GLFW_PLATFORM_WAYLAND) { return bgfx::NativeWindowHandleType::Wayland; - } else + } + else { return bgfx::NativeWindowHandleType::Default; } diff --git a/examples/common/entry/entry_sdl.cpp b/examples/common/entry/entry_sdl.cpp index 42cc8fb8795..79a2768cf56 100644 --- a/examples/common/entry/entry_sdl.cpp +++ b/examples/common/entry/entry_sdl.cpp @@ -47,9 +47,13 @@ namespace entry # if BX_PLATFORM_LINUX if (wmi.subsystem == SDL_SYSWM_WAYLAND) + { return (void*)wmi.info.wl.surface; + } else + { return (void*)wmi.info.x11.window; + } # elif BX_PLATFORM_OSX || BX_PLATFORM_IOS || BX_PLATFORM_VISIONOS return wmi.info.cocoa.window; # elif BX_PLATFORM_WINDOWS diff --git a/examples/common/entry/entry_windows.cpp b/examples/common/entry/entry_windows.cpp index 5abd60d4f4c..f25e50d6924 100644 --- a/examples/common/entry/entry_windows.cpp +++ b/examples/common/entry/entry_windows.cpp @@ -851,14 +851,18 @@ namespace entry if (utf16[0] >= 0xD800 && utf16[0] <= 0xDBFF) { m_surrogate = utf16[0]; - } else { + } + else + { int utf16_len; if (utf16[0] >= 0xDC00 && utf16[0] <= 0xDFFF) { utf16[1] = utf16[0]; utf16[0] = m_surrogate; m_surrogate = 0; utf16_len = 2; - } else { + } + else + { utf16_len = 1; } diff --git a/src/renderer_d3d11.cpp b/src/renderer_d3d11.cpp index a93da43086e..7d6636ae969 100644 --- a/src/renderer_d3d11.cpp +++ b/src/renderer_d3d11.cpp @@ -3399,10 +3399,10 @@ namespace bgfx { namespace d3d11 { case UniformType::Mat3: case UniformType::Mat3|kUniformFragmentBit: - { + { float* value = (float*)data; for (uint32_t ii = 0, count = num/3; ii < count; ++ii, loc += 3*16, value += 9) - { + { Matrix4 mtx; mtx.un.val[ 0] = value[0]; mtx.un.val[ 1] = value[1]; diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp index e8419f5a183..d480188a33d 100644 --- a/src/renderer_gl.cpp +++ b/src/renderer_gl.cpp @@ -3060,7 +3060,8 @@ namespace bgfx { namespace gl } #if BGFX_CONFIG_RENDERER_OPENGLES && (BGFX_CONFIG_RENDERER_OPENGLES < 30) - if (!m_maxMsaa && s_extension[Extension::IMG_multisampled_render_to_texture].m_supported) { + if (!m_maxMsaa && s_extension[Extension::IMG_multisampled_render_to_texture].m_supported) + { GL_CHECK(glGetIntegerv(GL_MAX_SAMPLES_IMG, &m_maxMsaa) ); } #endif // BGFX_CONFIG_RENDERER_OPENGLES < 30 @@ -7121,7 +7122,9 @@ namespace bgfx { namespace gl { attachment = GL_DEPTH_ATTACHMENT; } - } else { + } + else + { attachment = GL_COLOR_ATTACHMENT0 + colorIdx; ++colorIdx; } diff --git a/src/renderer_mtl.mm b/src/renderer_mtl.mm index 6d0b927c4bd..3971ff87e11 100644 --- a/src/renderer_mtl.mm +++ b/src/renderer_mtl.mm @@ -533,7 +533,7 @@ bool init(const Init& _init) , TextureFormat::Unknown , TextureFormat::UnknownDepth ); - + #if BX_PLATFORM_VISIONOS if (m_mainFrameBuffer.m_swapChain->m_useLayerRenderer) { @@ -923,7 +923,7 @@ void shutdown() MTL_RELEASE(m_vertexDescriptor); MTL_RELEASE(m_textureDescriptor); MTL_RELEASE(m_samplerDescriptor); - + #if BX_PLATFORM_VISIONOS if (m_mainFrameBuffer.m_swapChain->m_useLayerRenderer) { @@ -1077,7 +1077,7 @@ MTLPixelFormat getSwapChainPixelFormat(SwapChainMtl *swapChain) return cp_layer_renderer_configuration_get_color_format(layerConfiguration); } #endif // BX_PLATFORM_VISIONOS - + return swapChain->m_metalLayer.pixelFormat; } @@ -1328,18 +1328,21 @@ void blitSetup(TextVideoMemBlitter& _blitter) override { BX_UNUSED(_blitter); } - + #if BX_PLATFORM_VISIONOS - void calculateViewPorts(MTLViewport (&viewports)[2]) { + void calculateViewPorts(MTLViewport (&viewports)[2]) + { const int viewCount = 2; - for (int i = 0; i < viewCount; i++) { + for (int i = 0; i < viewCount; i++) + { cp_view_t view = cp_drawable_get_view(m_mainFrameBuffer.m_swapChain->m_layerRendererDrawable, i); cp_view_texture_map_t texture_map = cp_view_get_view_texture_map(view); viewports[i] = cp_view_texture_map_get_viewport(texture_map); } } - void setVertexAmplification(RenderCommandEncoder& _rce) { + void setVertexAmplification(RenderCommandEncoder& _rce) + { MTLVertexAmplificationViewMapping mapping0; MTLVertexAmplificationViewMapping mapping1; @@ -1399,7 +1402,8 @@ void blitRender(TextVideoMemBlitter& _blitter, uint32_t _numIndices) override #if BX_PLATFORM_VISIONOS if (m_mainFrameBuffer.m_swapChain->m_useLayerRenderer) { - if (cp_layer_renderer_configuration_get_layout(m_mainFrameBuffer.m_swapChain->m_layerRendererConfiguration) == cp_layer_renderer_layout_layered) { + if (cp_layer_renderer_configuration_get_layout(m_mainFrameBuffer.m_swapChain->m_layerRendererConfiguration) == cp_layer_renderer_layout_layered) + { MTLViewport viewports[2]; calculateViewPorts(viewports); rce.setViewports(viewports, 2); @@ -1411,7 +1415,7 @@ void blitRender(TextVideoMemBlitter& _blitter, uint32_t _numIndices) override { MTLViewport viewport = { 0.0f, 0.0f, (float)width, (float)height, 0.0f, 1.0f }; rce.setViewport(viewport); - + MTLScissorRect rc = { 0, 0, width, height }; rce.setScissorRect(rc); } @@ -1499,7 +1503,7 @@ void createPoseForTiming(cp_frame_timing_t timing, ar_world_tracking_provider_t } } #endif // BX_PLATFORM_VISIONOS - + void flip() override { if (NULL == m_commandBuffer) @@ -1983,7 +1987,7 @@ void setFrameBuffer(RenderPassDescriptor _renderPassDescriptor, FrameBufferHandl Texture texture = cp_drawable_get_depth_texture(swapChain->m_layerRendererDrawable, 0); _renderPassDescriptor.depthAttachment.texture = texture; _renderPassDescriptor.stencilAttachment.texture = swapChain->m_backBufferStencil; - + cp_layer_renderer_configuration_t layerConfiguration = cp_layer_renderer_get_configuration(swapChain->m_layerRenderer); cp_layer_renderer_layout layout = cp_layer_renderer_configuration_get_layout(layerConfiguration); if (layout == cp_layer_renderer_layout_layered) @@ -2530,7 +2534,8 @@ void processArguments( } } - if (streamUsed) { + if (streamUsed) + { vertexDesc.layouts[stream+1].stride = layout.getStride(); vertexDesc.layouts[stream+1].stepFunction = MTLVertexStepFunctionPerVertex; } @@ -2574,9 +2579,12 @@ void processArguments( BX_PRAGMA_DIAGNOSTIC_PUSH(); BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG("-Wunguarded-availability-new"); BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG("-Wincompatible-pointer-types"); - if (m_usesMTLBindings) { + if (m_usesMTLBindings) + { processArguments(pso, reflection.vertexBindings, reflection.fragmentBindings); - } else { + } + else + { processArguments(pso, reflection.vertexArguments, reflection.fragmentArguments); } BX_PRAGMA_DIAGNOSTIC_POP(); @@ -2630,9 +2638,12 @@ void processArguments( BX_PRAGMA_DIAGNOSTIC_PUSH(); BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG("-Wunguarded-availability-new"); BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG("-Wincompatible-pointer-types"); - if (m_usesMTLBindings) { + if (m_usesMTLBindings) + { processArguments(pso, reflection.bindings, NULL); - } else { + } + else + { processArguments(pso, reflection.arguments, NULL); } BX_PRAGMA_DIAGNOSTIC_POP(); @@ -3486,11 +3497,12 @@ void writeString(bx::WriterI* _writer, const char* _str) cp_layer_renderer_t layerRenderer = (cp_layer_renderer_t)_nwh; m_layerRenderer = layerRenderer; m_layerRendererConfiguration = cp_layer_renderer_get_configuration(m_layerRenderer); - - if (cp_layer_renderer_configuration_get_layout(m_layerRendererConfiguration) == cp_layer_renderer_layout_dedicated) { + + if (cp_layer_renderer_configuration_get_layout(m_layerRendererConfiguration) == cp_layer_renderer_layout_dedicated) + { BX_WARN(false, "Dedicated layer renderer layout is not supported."); } - + retain(m_layerRendererConfiguration); retain(m_layerRenderer); } @@ -3501,12 +3513,12 @@ void writeString(bx::WriterI* _writer, const char* _str) { release(m_metalLayer); } - + #if !BX_PLATFORM_VISIONOS if (NULL != NSClassFromString(@"MTKView") ) { MTKView *view = (MTKView *)_nwh; - + if (NULL != view && [view isKindOfClass:NSClassFromString(@"MTKView")]) { @@ -3514,7 +3526,7 @@ void writeString(bx::WriterI* _writer, const char* _str) } } #endif - + if (NULL != NSClassFromString(@"CAMetalLayer") ) { if (NULL == m_metalLayer) @@ -3527,7 +3539,7 @@ void writeString(bx::WriterI* _writer, const char* _str) BX_WARN(false, "Unable to create Metal device. Please set platform data window to a CAMetalLayer"); return; } - + m_metalLayer = metalLayer; } # elif BX_PLATFORM_OSX @@ -3541,7 +3553,7 @@ void writeString(bx::WriterI* _writer, const char* _str) else { NSView *contentView; - + if ([nvh isKindOfClass:[NSView class]]) { contentView = (NSView*)nvh; @@ -3556,7 +3568,7 @@ void writeString(bx::WriterI* _writer, const char* _str) BX_WARN(0, "Unable to create Metal device. Please set platform data window to an NSWindow, NSView, or CAMetalLayer"); return; } - + void (^setLayer)(void) = ^{ CALayer* layer = contentView.layer; if(NULL != layer && [layer isKindOfClass:NSClassFromString(@"CAMetalLayer")]) @@ -3570,7 +3582,7 @@ void writeString(bx::WriterI* _writer, const char* _str) [contentView setLayer:m_metalLayer]; } }; - + if ([NSThread isMainThread]) { setLayer(); @@ -3579,7 +3591,7 @@ void writeString(bx::WriterI* _writer, const char* _str) { bx::Semaphore semaphore; bx::Semaphore* psemaphore = &semaphore; - + CFRunLoopPerformBlock([[NSRunLoop mainRunLoop] getCFRunLoop], kCFRunLoopCommonModes, ^{ @@ -3592,13 +3604,13 @@ void writeString(bx::WriterI* _writer, const char* _str) } # endif // BX_PLATFORM_* } - + if (NULL == m_metalLayer) { BX_WARN(NULL != s_renderMtl->m_device, "Unable to create Metal device."); return; } - + m_metalLayer.device = s_renderMtl->m_device; m_metalLayer.pixelFormat = MTLPixelFormatBGRA8Unorm; m_metalLayer.magnificationFilter = kCAFilterNearest; @@ -3750,11 +3762,11 @@ void writeString(bx::WriterI* _writer, const char* _str) { cp_frame_timing_t timing = cp_frame_predict_timing(m_frame); if (timing == nullptr) { return nullptr; } - + cp_frame_start_update(m_frame); - + cp_frame_end_update(m_frame); - + cp_time_wait_until(cp_frame_timing_get_optimal_input_time(timing)); cp_frame_start_submission(m_frame); m_layerRendererDrawable = cp_frame_query_drawable(m_frame); @@ -4616,7 +4628,7 @@ static void setTimestamp(void* _data) vp.znear = 0.0f; vp.zfar = 1.0f; rce.setViewport(vp); - + MTLScissorRect sciRect = { viewState.m_rect.m_x, viewState.m_rect.m_y, @@ -4625,7 +4637,7 @@ static void setTimestamp(void* _data) }; rce.setScissorRect(sciRect); } - + if (BGFX_CLEAR_NONE != (clr.m_flags & BGFX_CLEAR_MASK) && !clearWithRenderPass) { diff --git a/src/renderer_vk.cpp b/src/renderer_vk.cpp index 2e2e9b85286..a7b8e3f4128 100644 --- a/src/renderer_vk.cpp +++ b/src/renderer_vk.cpp @@ -4175,10 +4175,10 @@ VK_IMPORT_DEVICE { case UniformType::Mat3: case UniformType::Mat3|kUniformFragmentBit: - { + { float* value = (float*)data; for (uint32_t ii = 0, count = num/3; ii < count; ++ii, loc += 3*16, value += 9) - { + { Matrix4 mtx; mtx.un.val[ 0] = value[0]; mtx.un.val[ 1] = value[1]; @@ -6540,7 +6540,8 @@ VK_DESTROY bimg::TextureFormat::Enum tf = bimg::TextureFormat::Enum(m_textureFormat); const bimg::ImageBlockInfo &blockInfo = bimg::getBlockInfo(tf); - for (uint32_t i = 0; i < _bufferImageCopyCount; ++i) { + for (uint32_t i = 0; i < _bufferImageCopyCount; ++i) + { BX_ASSERT( bx::uint32_mod(_bufferImageCopy[i].bufferOffset, blockInfo.blockSize) == 0 , "Misaligned texture of type %s to offset %u, which is not a multiple of %u."