diff --git a/MobileGL/MG_Backend/DirectVulkan/Managers/RenderStateManager.cpp b/MobileGL/MG_Backend/DirectVulkan/Managers/RenderStateManager.cpp index 9e224981..12bf2ca5 100644 --- a/MobileGL/MG_Backend/DirectVulkan/Managers/RenderStateManager.cpp +++ b/MobileGL/MG_Backend/DirectVulkan/Managers/RenderStateManager.cpp @@ -184,7 +184,7 @@ namespace MobileGL::MG_Backend::DirectVulkan { return XXH64_digest(m_hashState); } - VkBlendFactor RenderStateManager::ResolveBlendFactor(BlendFactor factor) const { + VkBlendFactor RenderStateManager::ResolveBlendFactor(BlendFactor factor) { switch (factor) { case BlendFactor::Zero: return VK_BLEND_FACTOR_ZERO; @@ -220,7 +220,7 @@ namespace MobileGL::MG_Backend::DirectVulkan { } } - VkCompareOp RenderStateManager::ResolveDepthCompareOp(DepthTestFunc func) const { + VkCompareOp RenderStateManager::ResolveDepthCompareOp(DepthTestFunc func) { switch (func) { case DepthTestFunc::Never: return VK_COMPARE_OP_NEVER; @@ -244,7 +244,7 @@ namespace MobileGL::MG_Backend::DirectVulkan { } } - VkCullModeFlags RenderStateManager::ResolveCullMode(CullFaceMode mode) const { + VkCullModeFlags RenderStateManager::ResolveCullMode(CullFaceMode mode) { switch (mode) { case CullFaceMode::Front: return VK_CULL_MODE_FRONT_BIT; @@ -258,7 +258,7 @@ namespace MobileGL::MG_Backend::DirectVulkan { } } - VkColorComponentFlags RenderStateManager::ResolveColorWriteMask(const BoolVec4& mask) const { + VkColorComponentFlags RenderStateManager::ResolveColorWriteMask(const BoolVec4& mask) { VkColorComponentFlags vkMask = 0; if (mask.x()) vkMask |= VK_COLOR_COMPONENT_R_BIT; if (mask.y()) vkMask |= VK_COLOR_COMPONENT_G_BIT; diff --git a/MobileGL/MG_Backend/DirectVulkan/Managers/RenderStateManager.h b/MobileGL/MG_Backend/DirectVulkan/Managers/RenderStateManager.h index b0d3dbef..941a912d 100644 --- a/MobileGL/MG_Backend/DirectVulkan/Managers/RenderStateManager.h +++ b/MobileGL/MG_Backend/DirectVulkan/Managers/RenderStateManager.h @@ -41,12 +41,12 @@ namespace MobileGL::MG_Backend::DirectVulkan { private: void Cleanup(); - void PatchCreateInfoPointers(RenderStateInfo& stateInfo); + static void PatchCreateInfoPointers(RenderStateInfo& stateInfo); HashType GetHash(const RenderStateParameters& renderState, Uint colorAttachmentCount); - VkBlendFactor ResolveBlendFactor(BlendFactor factor) const; - VkCompareOp ResolveDepthCompareOp(DepthTestFunc func) const; - VkCullModeFlags ResolveCullMode(CullFaceMode mode) const; - VkColorComponentFlags ResolveColorWriteMask(const BoolVec4& mask) const; + static VkBlendFactor ResolveBlendFactor(BlendFactor factor); + static VkCompareOp ResolveDepthCompareOp(DepthTestFunc func); + static VkCullModeFlags ResolveCullMode(CullFaceMode mode); + static VkColorComponentFlags ResolveColorWriteMask(const BoolVec4& mask); UnorderedMap m_renderStateInfo; XXH64_state_t* const m_hashState = XXH64_createState(); diff --git a/MobileGL/MG_Backend/DirectVulkan/Managers/VertexInputStateManager.cpp b/MobileGL/MG_Backend/DirectVulkan/Managers/VertexInputStateManager.cpp index 6a6f5d8e..7fc47bda 100644 --- a/MobileGL/MG_Backend/DirectVulkan/Managers/VertexInputStateManager.cpp +++ b/MobileGL/MG_Backend/DirectVulkan/Managers/VertexInputStateManager.cpp @@ -113,7 +113,7 @@ namespace MobileGL::MG_Backend::DirectVulkan { return XXH64_digest(m_hashState); } - Uint VertexInputStateManager::GetDataTypeByteSize(DataType type) const { + Uint VertexInputStateManager::GetDataTypeByteSize(DataType type) { switch (type) { case DataType::Int8: case DataType::Uint8: @@ -135,7 +135,7 @@ namespace MobileGL::MG_Backend::DirectVulkan { } } - VkFormat VertexInputStateManager::ResolveVertexFormat(const MG_State::GLState::VertexAttribute& attrib) const { + VkFormat VertexInputStateManager::ResolveVertexFormat(const MG_State::GLState::VertexAttribute& attrib) { auto size = attrib.Size; auto selectFormat = [size](VkFormat c1, VkFormat c2, VkFormat c3, VkFormat c4) { diff --git a/MobileGL/MG_Backend/DirectVulkan/Managers/VertexInputStateManager.h b/MobileGL/MG_Backend/DirectVulkan/Managers/VertexInputStateManager.h index 3826a33e..bb2e3ca7 100644 --- a/MobileGL/MG_Backend/DirectVulkan/Managers/VertexInputStateManager.h +++ b/MobileGL/MG_Backend/DirectVulkan/Managers/VertexInputStateManager.h @@ -33,10 +33,10 @@ namespace MobileGL::MG_Backend::DirectVulkan { private: void Cleanup(); - void PatchCreateInfoPointers(VertexInputStateInfo& stateInfo); + static void PatchCreateInfoPointers(VertexInputStateInfo& stateInfo); HashType GetHash(VertexArrayObject* vaoObject); - VkFormat ResolveVertexFormat(const MG_State::GLState::VertexAttribute& attrib) const; - Uint GetDataTypeByteSize(DataType type) const; + static VkFormat ResolveVertexFormat(const MG_State::GLState::VertexAttribute& attrib); + static Uint GetDataTypeByteSize(DataType type); UnorderedMap m_vertexInputStateInfo; XXH64_state_t* const m_hashState = XXH64_createState();