From d2485a3fbed131c42ee594991a9fcb1f84b300d5 Mon Sep 17 00:00:00 2001 From: BZLZHH Date: Fri, 20 Feb 2026 16:33:26 +0800 Subject: [PATCH] [Improvement] (MG_Backend/DirectVulkanTMP): Rename current DirectVulkan to DirectVulkanTMP. --- CMakeLists.txt | 16 +++---- MobileGL/GlobalObjects.cpp | 2 +- MobileGL/MG_Backend/BackendObject.h | 2 +- MobileGL/MG_Backend/BackendObjects.h | 2 +- .../BackendObject_DirectVulkanTMP.cpp} | 48 +++++++++---------- .../BackendObject_DirectVulkanTMP.h} | 10 ++-- .../DirectVulkanTMP.cpp} | 12 ++--- .../DirectVulkanTMP.h} | 6 +-- .../Managers/ProgramManager.cpp | 6 +-- .../Managers/ProgramManager.h | 6 +-- .../Renderer/FrameContext.cpp | 6 +-- .../Renderer/FrameContext.h | 6 +-- .../Renderer/PipelineManager.cpp | 4 +- .../Renderer/SwapchainManager.cpp | 6 +-- .../Renderer/SwapchainManager.h | 6 +-- .../Renderer/VkCommon.h | 8 ++-- .../Renderer/VulkanContext.cpp | 6 +-- .../Renderer/VulkanContext.h | 6 +-- .../TmpImpl.cpp | 8 ++-- .../TmpImpl.h | 10 ++-- MobileGL/MG_Backend/Init.cpp | 4 +- 21 files changed, 90 insertions(+), 90 deletions(-) rename MobileGL/MG_Backend/{DirectVulkan/BackendObject_DirectVulkan.cpp => DirectVulkanTMP/BackendObject_DirectVulkanTMP.cpp} (74%) rename MobileGL/MG_Backend/{DirectVulkan/BackendObject_DirectVulkan.h => DirectVulkanTMP/BackendObject_DirectVulkanTMP.h} (77%) rename MobileGL/MG_Backend/{DirectVulkan/DirectVulkan.cpp => DirectVulkanTMP/DirectVulkanTMP.cpp} (91%) rename MobileGL/MG_Backend/{DirectVulkan/DirectVulkan.h => DirectVulkanTMP/DirectVulkanTMP.h} (95%) rename MobileGL/MG_Backend/{DirectVulkan => DirectVulkanTMP}/Managers/ProgramManager.cpp (99%) rename MobileGL/MG_Backend/{DirectVulkan => DirectVulkanTMP}/Managers/ProgramManager.h (91%) rename MobileGL/MG_Backend/{DirectVulkan => DirectVulkanTMP}/Renderer/FrameContext.cpp (91%) rename MobileGL/MG_Backend/{DirectVulkan => DirectVulkanTMP}/Renderer/FrameContext.h (88%) rename MobileGL/MG_Backend/{DirectVulkan => DirectVulkanTMP}/Renderer/PipelineManager.cpp (67%) rename MobileGL/MG_Backend/{DirectVulkan => DirectVulkanTMP}/Renderer/SwapchainManager.cpp (97%) rename MobileGL/MG_Backend/{DirectVulkan => DirectVulkanTMP}/Renderer/SwapchainManager.h (90%) rename MobileGL/MG_Backend/{DirectVulkan => DirectVulkanTMP}/Renderer/VkCommon.h (74%) rename MobileGL/MG_Backend/{DirectVulkan => DirectVulkanTMP}/Renderer/VulkanContext.cpp (96%) rename MobileGL/MG_Backend/{DirectVulkan => DirectVulkanTMP}/Renderer/VulkanContext.h (89%) rename MobileGL/MG_Backend/{DirectVulkan => DirectVulkanTMP}/TmpImpl.cpp (99%) rename MobileGL/MG_Backend/{DirectVulkan => DirectVulkanTMP}/TmpImpl.h (97%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 99d3c4d1..4208274d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -209,14 +209,14 @@ set(SOURCE_FILES MobileGL/MG_Backend/DirectGLES/Utils.cpp MobileGL/MG_Backend/DirectGLES/Managers.cpp - MobileGL/MG_Backend/DirectVulkan/DirectVulkan.cpp - MobileGL/MG_Backend/DirectVulkan/TmpImpl.cpp - MobileGL/MG_Backend/DirectVulkan/BackendObject_DirectVulkan.cpp - MobileGL/MG_Backend/DirectVulkan/Renderer/VulkanContext.cpp - MobileGL/MG_Backend/DirectVulkan/Renderer/SwapchainManager.cpp - MobileGL/MG_Backend/DirectVulkan/Renderer/PipelineManager.cpp - MobileGL/MG_Backend/DirectVulkan/Renderer/FrameContext.cpp - MobileGL/MG_Backend/DirectVulkan/Managers/ProgramManager.cpp + MobileGL/MG_Backend/DirectVulkanTMP/DirectVulkanTMP.cpp + MobileGL/MG_Backend/DirectVulkanTMP/TmpImpl.cpp + MobileGL/MG_Backend/DirectVulkanTMP/BackendObject_DirectVulkanTMP.cpp + MobileGL/MG_Backend/DirectVulkanTMP/Renderer/VulkanContext.cpp + MobileGL/MG_Backend/DirectVulkanTMP/Renderer/SwapchainManager.cpp + MobileGL/MG_Backend/DirectVulkanTMP/Renderer/PipelineManager.cpp + MobileGL/MG_Backend/DirectVulkanTMP/Renderer/FrameContext.cpp + MobileGL/MG_Backend/DirectVulkanTMP/Managers/ProgramManager.cpp MobileGL/MG_State/GLState/Core.cpp MobileGL/MG_State/GLState/ErrorState/Error.cpp diff --git a/MobileGL/GlobalObjects.cpp b/MobileGL/GlobalObjects.cpp index 4b3689cf..d8502a54 100644 --- a/MobileGL/GlobalObjects.cpp +++ b/MobileGL/GlobalObjects.cpp @@ -10,7 +10,7 @@ namespace MobileGL { namespace MG_Config { - BackendType ActiveBackendType = BackendType::DirectVulkan; + BackendType ActiveBackendType = BackendType::DirectVulkanTMP; } // namespace MG_Config namespace MG_Backend { diff --git a/MobileGL/MG_Backend/BackendObject.h b/MobileGL/MG_Backend/BackendObject.h index 7befafa7..267c2a1d 100644 --- a/MobileGL/MG_Backend/BackendObject.h +++ b/MobileGL/MG_Backend/BackendObject.h @@ -12,7 +12,7 @@ namespace MobileGL { enum class BackendType { DirectGLES, - DirectVulkan, + DirectVulkanTMP, BackendTypeCount, Unknown = -1 }; diff --git a/MobileGL/MG_Backend/BackendObjects.h b/MobileGL/MG_Backend/BackendObjects.h index edcf63b4..3c82065d 100644 --- a/MobileGL/MG_Backend/BackendObjects.h +++ b/MobileGL/MG_Backend/BackendObjects.h @@ -10,7 +10,7 @@ #include #include "BackendObject.h" #include "DirectGLES/BackendObject_DirectGLES.h" -#include "DirectVulkan/BackendObject_DirectVulkan.h" +#include "DirectVulkanTMP/BackendObject_DirectVulkanTMP.h" namespace MobileGL::MG_Backend { extern UniquePtr pActiveBackendObject; diff --git a/MobileGL/MG_Backend/DirectVulkan/BackendObject_DirectVulkan.cpp b/MobileGL/MG_Backend/DirectVulkanTMP/BackendObject_DirectVulkanTMP.cpp similarity index 74% rename from MobileGL/MG_Backend/DirectVulkan/BackendObject_DirectVulkan.cpp rename to MobileGL/MG_Backend/DirectVulkanTMP/BackendObject_DirectVulkanTMP.cpp index f80ab70d..93268708 100644 --- a/MobileGL/MG_Backend/DirectVulkan/BackendObject_DirectVulkan.cpp +++ b/MobileGL/MG_Backend/DirectVulkanTMP/BackendObject_DirectVulkanTMP.cpp @@ -1,4 +1,4 @@ -// MobileGL - MobileGL/MG_Backend/DirectVulkan/BackendObject_DirectVulkan.cpp +// MobileGL - MobileGL/MG_Backend/DirectVulkanTMP/BackendObject_DirectVulkanTMP.cpp // Copyright (c) 2025-2026 MobileGL-Dev // Licensed under the GNU Lesser General Public License v3.0: // https://www.gnu.org/licenses/gpl-3.0.txt @@ -6,42 +6,42 @@ // SPDX-License-Identifier: LGPL-3.0-only // End of Source File Header -#include "BackendObject_DirectVulkan.h" +#include "BackendObject_DirectVulkanTMP.h" #include "MG_Backend/BackendObject.h" -#include "DirectVulkan.h" +#include "DirectVulkanTMP.h" #include "TmpImpl.h" #include -namespace MobileGL::MG_Backend::DirectVulkan { - BackendObject_DirectVulkan::~BackendObject_DirectVulkan() = default; +namespace MobileGL::MG_Backend::DirectVulkanTMP { + BackendObject_DirectVulkanTMP::~BackendObject_DirectVulkanTMP() = default; - void BackendObject_DirectVulkan::InitWindowSurface() { + void BackendObject_DirectVulkanTMP::InitWindowSurface() { auto nativeWindow = reinterpret_cast(m_windowHandle.Handle); - if (!DirectVulkan::InitWindowSurface(nativeWindow)) { - MGLOG_E("Failed to initialize window surface for DirectVulkan backend"); + if (!DirectVulkanTMP::InitWindowSurface(nativeWindow)) { + MGLOG_E("Failed to initialize window surface for DirectVulkanTMP backend"); } } - void BackendObject_DirectVulkan::Initialize() { + void BackendObject_DirectVulkanTMP::Initialize() { m_initialized = true; } - void BackendObject_DirectVulkan::InitCapabilities() { + void BackendObject_DirectVulkanTMP::InitCapabilities() { if (!m_initialized) { MGLOG_E("Cannot initialize capabilities before backend is initialized"); return; } MG_Util::BackendLoader::QueryVulkanCapabilities(m_vulkanCaps, - DirectVulkan::GetVulkanState().ctx->GetPhysicalDevice()); + DirectVulkanTMP::GetVulkanState().ctx->GetPhysicalDevice()); UpdateDynamicBackendParameters(); } - const RendererInfo& BackendObject_DirectVulkan::GetRendererInfo() const { + const RendererInfo& BackendObject_DirectVulkanTMP::GetRendererInfo() const { static RendererInfo RendererInfo = { - .RendererName = "Magma", // Renderer Name - .BackendName = "Direct (Vulkan)", // Backend Name - .ExtraVendor = Nullopt, // Extra vendor + .RendererName = "Magma-TMP", // Renderer Name + .BackendName = "Direct (Vulkan) TMP", // Backend Name + .ExtraVendor = Nullopt, // Extra vendor .RendererGLInfo = { .TargetGLVersion = {3, 3, 0}, // Target OpenGL Version @@ -55,9 +55,9 @@ namespace MobileGL::MG_Backend::DirectVulkan { return RendererInfo; } - String BackendObject_DirectVulkan::GetBackendAPIVersionString() const { + String BackendObject_DirectVulkanTMP::GetBackendAPIVersionString() const { if (!m_initialized) { - return ""; + return ""; } // Format: // , Vulkan , Driver @@ -67,15 +67,15 @@ namespace MobileGL::MG_Backend::DirectVulkan { return str; } - BackendType BackendObject_DirectVulkan::GetBackendType() const { - return BackendType::DirectVulkan; + BackendType BackendObject_DirectVulkanTMP::GetBackendType() const { + return BackendType::DirectVulkanTMP; } - const GlobalBackendFunctionsTable& BackendObject_DirectVulkan::GetBackendFunctions() const { + const GlobalBackendFunctionsTable& BackendObject_DirectVulkanTMP::GetBackendFunctions() const { static GlobalBackendFunctionsTable funcsTable; static Bool funcsTableInitialized = false; if (!funcsTableInitialized) { - funcsTable.Present = DirectVulkan::Present; + funcsTable.Present = DirectVulkanTMP::Present; funcsTable.GL.DrawArrays = DrawArrays; funcsTable.GL.DrawElements = DrawElements; funcsTable.GL.DrawElementsBaseVertex = DrawElementsBaseVertex; @@ -109,11 +109,11 @@ namespace MobileGL::MG_Backend::DirectVulkan { return funcsTable; } - const DynamicBackendParameters& BackendObject_DirectVulkan::GetDynamicParameters() const { + const DynamicBackendParameters& BackendObject_DirectVulkanTMP::GetDynamicParameters() const { return m_dynamicParameters; } - void BackendObject_DirectVulkan::UpdateDynamicBackendParameters() { + void BackendObject_DirectVulkanTMP::UpdateDynamicBackendParameters() { m_dynamicParameters.UniformBufferOffsetAlignment = m_vulkanCaps.UniformBufferOffsetAlignment; } -} // namespace MobileGL::MG_Backend::DirectVulkan +} // namespace MobileGL::MG_Backend::DirectVulkanTMP diff --git a/MobileGL/MG_Backend/DirectVulkan/BackendObject_DirectVulkan.h b/MobileGL/MG_Backend/DirectVulkanTMP/BackendObject_DirectVulkanTMP.h similarity index 77% rename from MobileGL/MG_Backend/DirectVulkan/BackendObject_DirectVulkan.h rename to MobileGL/MG_Backend/DirectVulkanTMP/BackendObject_DirectVulkanTMP.h index 44d8107d..3f8997ad 100644 --- a/MobileGL/MG_Backend/DirectVulkan/BackendObject_DirectVulkan.h +++ b/MobileGL/MG_Backend/DirectVulkanTMP/BackendObject_DirectVulkanTMP.h @@ -1,4 +1,4 @@ -// MobileGL - MobileGL/MG_Backend/DirectVulkan/BackendObject_DirectVulkan.h +// MobileGL - MobileGL/MG_Backend/DirectVulkanTMP/BackendObject_DirectVulkanTMP.h // Copyright (c) 2025-2026 MobileGL-Dev // Licensed under the GNU Lesser General Public License v3.0: // https://www.gnu.org/licenses/gpl-3.0.txt @@ -11,10 +11,10 @@ #include "../BackendObject.h" #include -namespace MobileGL::MG_Backend::DirectVulkan { - class BackendObject_DirectVulkan : public BackendObject { +namespace MobileGL::MG_Backend::DirectVulkanTMP { + class BackendObject_DirectVulkanTMP : public BackendObject { public: - ~BackendObject_DirectVulkan() override; + ~BackendObject_DirectVulkanTMP() override; void Initialize() override; void InitWindowSurface() override; @@ -33,4 +33,4 @@ namespace MobileGL::MG_Backend::DirectVulkan { DynamicBackendParameters m_dynamicParameters; MG_External::VulkanCapabilities m_vulkanCaps; }; -} // namespace MobileGL::MG_Backend::DirectVulkan +} // namespace MobileGL::MG_Backend::DirectVulkanTMP diff --git a/MobileGL/MG_Backend/DirectVulkan/DirectVulkan.cpp b/MobileGL/MG_Backend/DirectVulkanTMP/DirectVulkanTMP.cpp similarity index 91% rename from MobileGL/MG_Backend/DirectVulkan/DirectVulkan.cpp rename to MobileGL/MG_Backend/DirectVulkanTMP/DirectVulkanTMP.cpp index 02c608e9..3fa9c26f 100644 --- a/MobileGL/MG_Backend/DirectVulkan/DirectVulkan.cpp +++ b/MobileGL/MG_Backend/DirectVulkanTMP/DirectVulkanTMP.cpp @@ -1,4 +1,4 @@ -// MobileGL - MobileGL/MG_Backend/DirectVulkan/DirectVulkan.cpp +// MobileGL - MobileGL/MG_Backend/DirectVulkanTMP/DirectVulkanTMP.cpp // Copyright (c) 2025-2026 MobileGL-Dev // Licensed under the GNU Lesser General Public License v3.0: // https://www.gnu.org/licenses/gpl-3.0.txt @@ -6,16 +6,16 @@ // SPDX-License-Identifier: LGPL-3.0-only // End of Source File Header -#include "DirectVulkan.h" +#include "DirectVulkanTMP.h" #include "TmpImpl.h" -namespace MobileGL::MG_Backend::DirectVulkan { +namespace MobileGL::MG_Backend::DirectVulkanTMP { void Clear(GLbitfield mask) { - MobileGL::MG_Backend::DirectVulkan::TmpImpl::Clear(mask); + MobileGL::MG_Backend::DirectVulkanTMP::TmpImpl::Clear(mask); } void DrawElements(GLenum mode, GLsizei count, GLenum type, const void* indices) { - MobileGL::MG_Backend::DirectVulkan::TmpImpl::DrawElements(mode, count, type, indices); + MobileGL::MG_Backend::DirectVulkanTMP::TmpImpl::DrawElements(mode, count, type, indices); } void ClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil) {} @@ -71,4 +71,4 @@ namespace MobileGL::MG_Backend::DirectVulkan { const TmpImpl::VulkanState& GetVulkanState() { return TmpImpl::GetVulkanState(); } -} // namespace MobileGL::MG_Backend::DirectVulkan +} // namespace MobileGL::MG_Backend::DirectVulkanTMP diff --git a/MobileGL/MG_Backend/DirectVulkan/DirectVulkan.h b/MobileGL/MG_Backend/DirectVulkanTMP/DirectVulkanTMP.h similarity index 95% rename from MobileGL/MG_Backend/DirectVulkan/DirectVulkan.h rename to MobileGL/MG_Backend/DirectVulkanTMP/DirectVulkanTMP.h index c4c11695..4802b00d 100644 --- a/MobileGL/MG_Backend/DirectVulkan/DirectVulkan.h +++ b/MobileGL/MG_Backend/DirectVulkanTMP/DirectVulkanTMP.h @@ -1,4 +1,4 @@ -// MobileGL - MobileGL/MG_Backend/DirectVulkan/DirectVulkan.h +// MobileGL - MobileGL/MG_Backend/DirectVulkanTMP/DirectVulkanTMP.h // Copyright (c) 2025-2026 MobileGL-Dev // Licensed under the GNU Lesser General Public License v3.0: // https://www.gnu.org/licenses/gpl-3.0.txt @@ -9,7 +9,7 @@ #pragma once #include -namespace MobileGL::MG_Backend::DirectVulkan { +namespace MobileGL::MG_Backend::DirectVulkanTMP { namespace TmpImpl { class VulkanState; } // namespace TmpImpl @@ -55,4 +55,4 @@ namespace MobileGL::MG_Backend::DirectVulkan { Bool InitWindowSurface(NativeWindowType window); void Present(); const TmpImpl::VulkanState& GetVulkanState(); -} // namespace MobileGL::MG_Backend::DirectVulkan +} // namespace MobileGL::MG_Backend::DirectVulkanTMP diff --git a/MobileGL/MG_Backend/DirectVulkan/Managers/ProgramManager.cpp b/MobileGL/MG_Backend/DirectVulkanTMP/Managers/ProgramManager.cpp similarity index 99% rename from MobileGL/MG_Backend/DirectVulkan/Managers/ProgramManager.cpp rename to MobileGL/MG_Backend/DirectVulkanTMP/Managers/ProgramManager.cpp index 2483e154..9977fb1c 100644 --- a/MobileGL/MG_Backend/DirectVulkan/Managers/ProgramManager.cpp +++ b/MobileGL/MG_Backend/DirectVulkanTMP/Managers/ProgramManager.cpp @@ -1,4 +1,4 @@ -// MobileGL - MobileGL/MG_Backend/DirectVulkan/Managers/ProgramManager.cpp +// MobileGL - MobileGL/MG_Backend/DirectVulkanTMP/Managers/ProgramManager.cpp // Copyright (c) 2025-2026 MobileGL-Dev // Licensed under the GNU Lesser General Public License v3.0: // https://www.gnu.org/licenses/gpl-3.0.txt @@ -21,7 +21,7 @@ #include -namespace MobileGL::MG_Backend::DirectVulkan::VkManager { +namespace MobileGL::MG_Backend::DirectVulkanTMP::VkManager { namespace { using ProgramObject = MG_State::GLState::ProgramObject; using ShaderObject = MG_State::GLState::ShaderObject; @@ -444,4 +444,4 @@ namespace MobileGL::MG_Backend::DirectVulkan::VkManager { return entry.stages; } -} // namespace MobileGL::MG_Backend::DirectVulkan::VkManager +} // namespace MobileGL::MG_Backend::DirectVulkanTMP::VkManager diff --git a/MobileGL/MG_Backend/DirectVulkan/Managers/ProgramManager.h b/MobileGL/MG_Backend/DirectVulkanTMP/Managers/ProgramManager.h similarity index 91% rename from MobileGL/MG_Backend/DirectVulkan/Managers/ProgramManager.h rename to MobileGL/MG_Backend/DirectVulkanTMP/Managers/ProgramManager.h index b1f36473..0e1c2f73 100644 --- a/MobileGL/MG_Backend/DirectVulkan/Managers/ProgramManager.h +++ b/MobileGL/MG_Backend/DirectVulkanTMP/Managers/ProgramManager.h @@ -1,4 +1,4 @@ -// MobileGL - MobileGL/MG_Backend/DirectVulkan/Managers/ProgramManager.h +// MobileGL - MobileGL/MG_Backend/DirectVulkanTMP/Managers/ProgramManager.h // Copyright (c) 2025-2026 MobileGL-Dev // Licensed under the GNU Lesser General Public License v3.0: // https://www.gnu.org/licenses/gpl-3.0.txt @@ -12,7 +12,7 @@ #include "../Renderer/VkCommon.h" #include "MG_State/GLState/ProgramState/ProgramObject.h" -namespace MobileGL::MG_Backend::DirectVulkan::VkManager { +namespace MobileGL::MG_Backend::DirectVulkanTMP::VkManager { enum class ShaderTransformBit : Uint { None = 0, PositionYFlip = 1 << 0, @@ -55,4 +55,4 @@ namespace MobileGL::MG_Backend::DirectVulkan::VkManager { VulkanContext& m_ctx; UnorderedMap m_cache; }; -} // namespace MobileGL::MG_Backend::DirectVulkan::VkManager +} // namespace MobileGL::MG_Backend::DirectVulkanTMP::VkManager diff --git a/MobileGL/MG_Backend/DirectVulkan/Renderer/FrameContext.cpp b/MobileGL/MG_Backend/DirectVulkanTMP/Renderer/FrameContext.cpp similarity index 91% rename from MobileGL/MG_Backend/DirectVulkan/Renderer/FrameContext.cpp rename to MobileGL/MG_Backend/DirectVulkanTMP/Renderer/FrameContext.cpp index 0c1dece4..571186d1 100644 --- a/MobileGL/MG_Backend/DirectVulkan/Renderer/FrameContext.cpp +++ b/MobileGL/MG_Backend/DirectVulkanTMP/Renderer/FrameContext.cpp @@ -1,4 +1,4 @@ -// MobileGL - MobileGL/MG_Backend/DirectVulkan/Renderer/FrameContext.cpp +// MobileGL - MobileGL/MG_Backend/DirectVulkanTMP/Renderer/FrameContext.cpp // Copyright (c) 2025-2026 MobileGL-Dev // Licensed under the GNU Lesser General Public License v3.0: // https://www.gnu.org/licenses/gpl-3.0.txt @@ -8,7 +8,7 @@ #include "FrameContext.h" -namespace MobileGL::MG_Backend::DirectVulkan::VkManager { +namespace MobileGL::MG_Backend::DirectVulkanTMP::VkManager { void FrameContext::Initialize(VulkanContext& ctx, VkCommandPool pool) { CommandPool = pool; VkCommandBufferAllocateInfo abci{VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO}; @@ -46,4 +46,4 @@ namespace MobileGL::MG_Backend::DirectVulkan::VkManager { } CommandPool = VK_NULL_HANDLE; } -} // namespace MobileGL::MG_Backend::DirectVulkan::VkManager +} // namespace MobileGL::MG_Backend::DirectVulkanTMP::VkManager diff --git a/MobileGL/MG_Backend/DirectVulkan/Renderer/FrameContext.h b/MobileGL/MG_Backend/DirectVulkanTMP/Renderer/FrameContext.h similarity index 88% rename from MobileGL/MG_Backend/DirectVulkan/Renderer/FrameContext.h rename to MobileGL/MG_Backend/DirectVulkanTMP/Renderer/FrameContext.h index 69b7813c..fbbed64d 100644 --- a/MobileGL/MG_Backend/DirectVulkan/Renderer/FrameContext.h +++ b/MobileGL/MG_Backend/DirectVulkanTMP/Renderer/FrameContext.h @@ -1,4 +1,4 @@ -// MobileGL - MobileGL/MG_Backend/DirectVulkan/Renderer/FrameContext.h +// MobileGL - MobileGL/MG_Backend/DirectVulkanTMP/Renderer/FrameContext.h // Copyright (c) 2025-2026 MobileGL-Dev // Licensed under the GNU Lesser General Public License v3.0: // https://www.gnu.org/licenses/gpl-3.0.txt @@ -11,7 +11,7 @@ #include "VulkanContext.h" #include "VkCommon.h" -namespace MobileGL::MG_Backend::DirectVulkan { +namespace MobileGL::MG_Backend::DirectVulkanTMP { struct TrashBuffer { VkBuffer buffer = VK_NULL_HANDLE; VkDeviceMemory memory = VK_NULL_HANDLE; @@ -39,4 +39,4 @@ namespace MobileGL::MG_Backend::DirectVulkan { void Cleanup(VulkanContext& ctx); }; } // namespace VkManager -} // namespace MobileGL::MG_Backend::DirectVulkan +} // namespace MobileGL::MG_Backend::DirectVulkanTMP diff --git a/MobileGL/MG_Backend/DirectVulkan/Renderer/PipelineManager.cpp b/MobileGL/MG_Backend/DirectVulkanTMP/Renderer/PipelineManager.cpp similarity index 67% rename from MobileGL/MG_Backend/DirectVulkan/Renderer/PipelineManager.cpp rename to MobileGL/MG_Backend/DirectVulkanTMP/Renderer/PipelineManager.cpp index 5fd77cc6..b766edc3 100644 --- a/MobileGL/MG_Backend/DirectVulkan/Renderer/PipelineManager.cpp +++ b/MobileGL/MG_Backend/DirectVulkanTMP/Renderer/PipelineManager.cpp @@ -1,4 +1,4 @@ -// MobileGL - MobileGL/MG_Backend/DirectVulkan/Renderer/PipelineManager.cpp +// MobileGL - MobileGL/MG_Backend/DirectVulkanTMP/Renderer/PipelineManager.cpp // Copyright (c) 2025-2026 MobileGL-Dev // Licensed under the GNU Lesser General Public License v3.0: // https://www.gnu.org/licenses/gpl-3.0.txt @@ -8,4 +8,4 @@ #include -namespace MobileGL::MG_Backend::DirectVulkan::VkManager {} +namespace MobileGL::MG_Backend::DirectVulkanTMP::VkManager {} diff --git a/MobileGL/MG_Backend/DirectVulkan/Renderer/SwapchainManager.cpp b/MobileGL/MG_Backend/DirectVulkanTMP/Renderer/SwapchainManager.cpp similarity index 97% rename from MobileGL/MG_Backend/DirectVulkan/Renderer/SwapchainManager.cpp rename to MobileGL/MG_Backend/DirectVulkanTMP/Renderer/SwapchainManager.cpp index 2c82d756..dc4a0be8 100644 --- a/MobileGL/MG_Backend/DirectVulkan/Renderer/SwapchainManager.cpp +++ b/MobileGL/MG_Backend/DirectVulkanTMP/Renderer/SwapchainManager.cpp @@ -1,4 +1,4 @@ -// MobileGL - MobileGL/MG_Backend/DirectVulkan/Renderer/SwapchainManager.cpp +// MobileGL - MobileGL/MG_Backend/DirectVulkanTMP/Renderer/SwapchainManager.cpp // Copyright (c) 2025-2026 MobileGL-Dev // Licensed under the GNU Lesser General Public License v3.0: // https://www.gnu.org/licenses/gpl-3.0.txt @@ -8,7 +8,7 @@ #include "SwapchainManager.h" -namespace MobileGL::MG_Backend::DirectVulkan::VkManager { +namespace MobileGL::MG_Backend::DirectVulkanTMP::VkManager { namespace { VkSurfaceFormatKHR ChooseSurfaceFormat(const Vector& formats) { for (const auto& f : formats) { @@ -163,4 +163,4 @@ namespace MobileGL::MG_Backend::DirectVulkan::VkManager { m_format = surfaceFormat.format; m_extent = extent; } -} // namespace MobileGL::MG_Backend::DirectVulkan::VkManager +} // namespace MobileGL::MG_Backend::DirectVulkanTMP::VkManager diff --git a/MobileGL/MG_Backend/DirectVulkan/Renderer/SwapchainManager.h b/MobileGL/MG_Backend/DirectVulkanTMP/Renderer/SwapchainManager.h similarity index 90% rename from MobileGL/MG_Backend/DirectVulkan/Renderer/SwapchainManager.h rename to MobileGL/MG_Backend/DirectVulkanTMP/Renderer/SwapchainManager.h index 7434cfdd..0d731af4 100644 --- a/MobileGL/MG_Backend/DirectVulkan/Renderer/SwapchainManager.h +++ b/MobileGL/MG_Backend/DirectVulkanTMP/Renderer/SwapchainManager.h @@ -1,4 +1,4 @@ -// MobileGL - MobileGL/MG_Backend/DirectVulkan/Renderer/SwapchainManager.h +// MobileGL - MobileGL/MG_Backend/DirectVulkanTMP/Renderer/SwapchainManager.h // Copyright (c) 2025-2026 MobileGL-Dev // Licensed under the GNU Lesser General Public License v3.0: // https://www.gnu.org/licenses/gpl-3.0.txt @@ -12,7 +12,7 @@ #include "VulkanContext.h" #include "VkCommon.h" -namespace MobileGL::MG_Backend::DirectVulkan::VkManager { +namespace MobileGL::MG_Backend::DirectVulkanTMP::VkManager { class SwapchainManager { public: explicit SwapchainManager(VulkanContext& ctx) : m_ctx(ctx) {} @@ -49,4 +49,4 @@ namespace MobileGL::MG_Backend::DirectVulkan::VkManager { Vector m_imagesInFlight; UintVec2 m_viewportSize{0, 0}; }; -} // namespace MobileGL::MG_Backend::DirectVulkan::VkManager +} // namespace MobileGL::MG_Backend::DirectVulkanTMP::VkManager diff --git a/MobileGL/MG_Backend/DirectVulkan/Renderer/VkCommon.h b/MobileGL/MG_Backend/DirectVulkanTMP/Renderer/VkCommon.h similarity index 74% rename from MobileGL/MG_Backend/DirectVulkan/Renderer/VkCommon.h rename to MobileGL/MG_Backend/DirectVulkanTMP/Renderer/VkCommon.h index c2b431e2..4bca7f2d 100644 --- a/MobileGL/MG_Backend/DirectVulkan/Renderer/VkCommon.h +++ b/MobileGL/MG_Backend/DirectVulkanTMP/Renderer/VkCommon.h @@ -1,4 +1,4 @@ -// MobileGL - MobileGL/MG_Backend/DirectVulkan/Renderer/VkCommon.h +// MobileGL - MobileGL/MG_Backend/DirectVulkanTMP/Renderer/VkCommon.h // Copyright (c) 2025-2026 MobileGL-Dev // Licensed under the GNU Lesser General Public License v3.0: // https://www.gnu.org/licenses/gpl-3.0.txt @@ -9,14 +9,14 @@ #pragma once #include -namespace MobileGL::MG_Backend::DirectVulkan::VkManager { +namespace MobileGL::MG_Backend::DirectVulkanTMP::VkManager { inline void VkCheck(VkResult result, const char* msg) { if (result == VK_SUCCESS || result == VK_SUBOPTIMAL_KHR) return; MGLOG_E("Vulkan error %d at %s", static_cast(result), msg ? msg : "(unknown)"); throw RuntimeError(msg ? msg : "Vulkan error"); } -} // namespace MobileGL::MG_Backend::DirectVulkan::VkManager +} // namespace MobileGL::MG_Backend::DirectVulkanTMP::VkManager #ifndef VK_VERIFY -#define VK_VERIFY(res, msg) ::MobileGL::MG_Backend::DirectVulkan::VkManager::VkCheck((res), (msg)) +#define VK_VERIFY(res, msg) ::MobileGL::MG_Backend::DirectVulkanTMP::VkManager::VkCheck((res), (msg)) #endif diff --git a/MobileGL/MG_Backend/DirectVulkan/Renderer/VulkanContext.cpp b/MobileGL/MG_Backend/DirectVulkanTMP/Renderer/VulkanContext.cpp similarity index 96% rename from MobileGL/MG_Backend/DirectVulkan/Renderer/VulkanContext.cpp rename to MobileGL/MG_Backend/DirectVulkanTMP/Renderer/VulkanContext.cpp index 11d1cd59..7ba35316 100644 --- a/MobileGL/MG_Backend/DirectVulkan/Renderer/VulkanContext.cpp +++ b/MobileGL/MG_Backend/DirectVulkanTMP/Renderer/VulkanContext.cpp @@ -1,4 +1,4 @@ -// MobileGL - MobileGL/MG_Backend/DirectVulkan/Renderer/VulkanContext.cpp +// MobileGL - MobileGL/MG_Backend/DirectVulkanTMP/Renderer/VulkanContext.cpp // Copyright (c) 2025-2026 MobileGL-Dev // Licensed under the GNU Lesser General Public License v3.0: // https://www.gnu.org/licenses/gpl-3.0.txt @@ -8,7 +8,7 @@ #include "VulkanContext.h" -namespace MobileGL::MG_Backend::DirectVulkan::VkManager { +namespace MobileGL::MG_Backend::DirectVulkanTMP::VkManager { namespace { Bool CheckDeviceExtensionSupport(VkPhysicalDevice device, const Vector& required) { Uint32 count = 0; @@ -162,4 +162,4 @@ namespace MobileGL::MG_Backend::DirectVulkan::VkManager { VK_VERIFY(vkCreateDevice(m_physicalDevice, &dci, nullptr, &m_device), "vkCreateDevice"); vkGetDeviceQueue(m_device, m_graphicsQueueFamily, 0, &m_graphicsQueue); } -} // namespace MobileGL::MG_Backend::DirectVulkan::VkManager +} // namespace MobileGL::MG_Backend::DirectVulkanTMP::VkManager diff --git a/MobileGL/MG_Backend/DirectVulkan/Renderer/VulkanContext.h b/MobileGL/MG_Backend/DirectVulkanTMP/Renderer/VulkanContext.h similarity index 89% rename from MobileGL/MG_Backend/DirectVulkan/Renderer/VulkanContext.h rename to MobileGL/MG_Backend/DirectVulkanTMP/Renderer/VulkanContext.h index 74c68b4a..57527b3b 100644 --- a/MobileGL/MG_Backend/DirectVulkan/Renderer/VulkanContext.h +++ b/MobileGL/MG_Backend/DirectVulkanTMP/Renderer/VulkanContext.h @@ -1,4 +1,4 @@ -// MobileGL - MobileGL/MG_Backend/DirectVulkan/Renderer/VulkanContext.h +// MobileGL - MobileGL/MG_Backend/DirectVulkanTMP/Renderer/VulkanContext.h // Copyright (c) 2025-2026 MobileGL-Dev // Licensed under the GNU Lesser General Public License v3.0: // https://www.gnu.org/licenses/gpl-3.0.txt @@ -10,7 +10,7 @@ #include #include "VkCommon.h" -namespace MobileGL::MG_Backend::DirectVulkan::VkManager { +namespace MobileGL::MG_Backend::DirectVulkanTMP::VkManager { class VulkanContext { public: VulkanContext() = default; @@ -44,4 +44,4 @@ namespace MobileGL::MG_Backend::DirectVulkan::VkManager { Uint32 m_graphicsQueueFamily = ~0u; ANativeWindow* m_window = nullptr; }; -} // namespace MobileGL::MG_Backend::DirectVulkan::VkManager +} // namespace MobileGL::MG_Backend::DirectVulkanTMP::VkManager diff --git a/MobileGL/MG_Backend/DirectVulkan/TmpImpl.cpp b/MobileGL/MG_Backend/DirectVulkanTMP/TmpImpl.cpp similarity index 99% rename from MobileGL/MG_Backend/DirectVulkan/TmpImpl.cpp rename to MobileGL/MG_Backend/DirectVulkanTMP/TmpImpl.cpp index 854dcf71..06b67bd3 100644 --- a/MobileGL/MG_Backend/DirectVulkan/TmpImpl.cpp +++ b/MobileGL/MG_Backend/DirectVulkanTMP/TmpImpl.cpp @@ -1,4 +1,4 @@ -// MobileGL - MobileGL/MG_Backend/DirectVulkan/TmpImpl.cpp +// MobileGL - MobileGL/MG_Backend/DirectVulkanTMP/TmpImpl.cpp // Copyright (c) 2025-2026 MobileGL-Dev // Licensed under the GNU Lesser General Public License v3.0: // https://www.gnu.org/licenses/gpl-3.0.txt @@ -14,7 +14,7 @@ #include #define DEBUG_TRACE_POINT() MGLOG_D("DV TmpImpl Trace: %s:%d", __func__, __LINE__) -namespace MobileGL::MG_Backend::DirectVulkan::TmpImpl { +namespace MobileGL::MG_Backend::DirectVulkanTMP::TmpImpl { class PendingClearInfo; void BeginRenderPass(GLbitfield clearMask, const PendingClearInfo* clearInfo); @@ -2861,7 +2861,7 @@ namespace MobileGL::MG_Backend::DirectVulkan::TmpImpl { if (g.initialized) return; g.ctx = MakeUnique(); - g.ctx->Initialize(window, "MobileGL-DirectVulkan-Tmp"); + g.ctx->Initialize(window, "MobileGL-DirectVulkanTMP-Tmp"); g.swapchain = MakeUnique(*g.ctx); g.swapchain->Initialize(); @@ -3544,4 +3544,4 @@ namespace MobileGL::MG_Backend::DirectVulkan::TmpImpl { } clearInfo.mask |= validMask; } -} // namespace MobileGL::MG_Backend::DirectVulkan::TmpImpl +} // namespace MobileGL::MG_Backend::DirectVulkanTMP::TmpImpl diff --git a/MobileGL/MG_Backend/DirectVulkan/TmpImpl.h b/MobileGL/MG_Backend/DirectVulkanTMP/TmpImpl.h similarity index 97% rename from MobileGL/MG_Backend/DirectVulkan/TmpImpl.h rename to MobileGL/MG_Backend/DirectVulkanTMP/TmpImpl.h index 541ae6de..80a9f0fd 100644 --- a/MobileGL/MG_Backend/DirectVulkan/TmpImpl.h +++ b/MobileGL/MG_Backend/DirectVulkanTMP/TmpImpl.h @@ -1,4 +1,4 @@ -// MobileGL - MobileGL/MG_Backend/DirectVulkan/TmpImpl.h +// MobileGL - MobileGL/MG_Backend/DirectVulkanTMP/TmpImpl.h // Copyright (c) 2025-2026 MobileGL-Dev // Licensed under the GNU Lesser General Public License v3.0: // https://www.gnu.org/licenses/gpl-3.0.txt @@ -15,8 +15,8 @@ #include "Managers/ProgramManager.h" #include -namespace MobileGL::MG_Backend::DirectVulkan::TmpImpl { - namespace DV = MobileGL::MG_Backend::DirectVulkan::VkManager; +namespace MobileGL::MG_Backend::DirectVulkanTMP::TmpImpl { + namespace DV = MobileGL::MG_Backend::DirectVulkanTMP::VkManager; using BufferObject = MobileGL::MG_State::GLState::BufferObject; using ProgramObject = MobileGL::MG_State::GLState::ProgramObject; using VertexArrayObject = MobileGL::MG_State::GLState::VertexArrayObject; @@ -26,7 +26,7 @@ namespace MobileGL::MG_Backend::DirectVulkan::TmpImpl { using RenderbufferObject = MobileGL::MG_State::GLState::RenderbufferObject; using SamplerObject = MobileGL::MG_State::GLState::SamplerObject; using TextureObjectMipmap = MobileGL::MG_State::GLState::TextureObjectMipmap; - using TrashImage = MobileGL::MG_Backend::DirectVulkan::TrashImage; + using TrashImage = MobileGL::MG_Backend::DirectVulkanTMP::TrashImage; struct BufferResource { VkBuffer buffer = VK_NULL_HANDLE; @@ -267,4 +267,4 @@ namespace MobileGL::MG_Backend::DirectVulkan::TmpImpl { void CopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); void GenerateMipmap(GLenum target); -} // namespace MobileGL::MG_Backend::DirectVulkan::TmpImpl +} // namespace MobileGL::MG_Backend::DirectVulkanTMP::TmpImpl diff --git a/MobileGL/MG_Backend/Init.cpp b/MobileGL/MG_Backend/Init.cpp index fec43324..d2aaccd9 100644 --- a/MobileGL/MG_Backend/Init.cpp +++ b/MobileGL/MG_Backend/Init.cpp @@ -52,8 +52,8 @@ namespace MobileGL::MG_Backend { case BackendType::DirectGLES: pActiveBackendObject = MakeUnique(); break; - case BackendType::DirectVulkan: - pActiveBackendObject = MakeUnique(); + case BackendType::DirectVulkanTMP: + pActiveBackendObject = MakeUnique(); break; case BackendType::Unknown: default: