From f1bc31afcfb50d3ad9300f70cdca375b34f3d20d Mon Sep 17 00:00:00 2001 From: Matt <97983689+bluepilledgreat@users.noreply.github.com> Date: Tue, 12 May 2026 20:12:35 +0100 Subject: [PATCH 1/2] fix renderer warnings --- source/renderer/ConstantBufferMetaData.cpp | 4 ++-- source/renderer/ConstantBufferMetaData.hpp | 2 +- .../renderer/ConstantBufferMetaDataManager.cpp | 4 ++-- source/renderer/UniformMetaData.cpp | 2 +- source/renderer/UniformMetaData.hpp | 6 +++--- .../hal/base/ConstantBufferContainerBase.cpp | 2 +- .../hal/base/ConstantBufferContainerBase.hpp | 4 ++-- .../renderer/hal/base/ShaderConstantBase.hpp | 6 +++--- .../hal/enums/RenderStateType_JsonParser.cpp | 17 +++++++++++++++++ .../hal/enums/RenderStateType_JsonParser.hpp | 18 +----------------- .../hal/enums/ShaderPrimitiveTypes.cpp | 2 +- .../hal/enums/ShaderPrimitiveTypes.hpp | 2 +- 12 files changed, 35 insertions(+), 34 deletions(-) diff --git a/source/renderer/ConstantBufferMetaData.cpp b/source/renderer/ConstantBufferMetaData.cpp index 6c39762ee..155bd03d2 100644 --- a/source/renderer/ConstantBufferMetaData.cpp +++ b/source/renderer/ConstantBufferMetaData.cpp @@ -41,13 +41,13 @@ const UniformMetaData* ConstantBufferMetaData::getUniformMetaData(const std::str return nullptr; } -unsigned int ConstantBufferMetaData::getRequiredSpaceForUniforms() const +size_t ConstantBufferMetaData::getRequiredSpaceForUniforms() const { if (m_uniformMetaData.empty()) return 0; const UniformMetaData& lastUniform = m_uniformMetaData.back(); - unsigned int unalignedSize = lastUniform.getSize() + lastUniform.m_byteOffset; + size_t unalignedSize = lastUniform.getSize() + lastUniform.m_byteOffset; return AlignmentHelper::getAlignedOffset(unalignedSize, 16); } diff --git a/source/renderer/ConstantBufferMetaData.hpp b/source/renderer/ConstantBufferMetaData.hpp index 16d77fb51..b0f1fd3bd 100644 --- a/source/renderer/ConstantBufferMetaData.hpp +++ b/source/renderer/ConstantBufferMetaData.hpp @@ -21,6 +21,6 @@ namespace mce const std::string& getConstantBufferName() const; const UniformMetaData* getUniformMetaData(const std::string& uniformName) const; - unsigned int getRequiredSpaceForUniforms() const; + size_t getRequiredSpaceForUniforms() const; }; } diff --git a/source/renderer/ConstantBufferMetaDataManager.cpp b/source/renderer/ConstantBufferMetaDataManager.cpp index f5b8ff5ab..cf595546c 100644 --- a/source/renderer/ConstantBufferMetaDataManager.cpp +++ b/source/renderer/ConstantBufferMetaDataManager.cpp @@ -21,8 +21,8 @@ void ConstantBufferMetaDataManager::allocateConstantBufferContainers() ConstantBufferMetaData& bufferMeta = m_constantBufferMetaDataList[i]; ConstantBufferContainer buffer; - unsigned int uniformCount = bufferMeta.m_uniformMetaData.size(); - unsigned int bufferSize = bufferMeta.getRequiredSpaceForUniforms(); + size_t uniformCount = bufferMeta.m_uniformMetaData.size(); + size_t bufferSize = bufferMeta.getRequiredSpaceForUniforms(); buffer.reserveMemoryForShaderConstants(uniformCount, bufferSize); buffer.m_constantBufferName = bufferMeta.getConstantBufferName(); diff --git a/source/renderer/UniformMetaData.cpp b/source/renderer/UniformMetaData.cpp index e1ddf8277..cc9a1a4c1 100644 --- a/source/renderer/UniformMetaData.cpp +++ b/source/renderer/UniformMetaData.cpp @@ -11,7 +11,7 @@ UniformMetaData::UniformMetaData() m_constantBufferMetaDataParent = nullptr; } -unsigned int UniformMetaData::getSize() const +size_t UniformMetaData::getSize() const { return ShaderPrimitiveTypeHelper::sizeInBytesFromShaderPrimitiveType(m_shaderPrimitiveType); } diff --git a/source/renderer/UniformMetaData.hpp b/source/renderer/UniformMetaData.hpp index fc4cc287b..356a8268d 100644 --- a/source/renderer/UniformMetaData.hpp +++ b/source/renderer/UniformMetaData.hpp @@ -10,8 +10,8 @@ namespace mce class UniformMetaData { public: - unsigned int m_numberOfElements; - unsigned int m_byteOffset; + size_t m_numberOfElements; + size_t m_byteOffset; ShaderPrimitiveTypes m_shaderPrimitiveType; ConstantBufferMetaData* m_constantBufferMetaDataParent; std::string m_uniformName; @@ -19,6 +19,6 @@ namespace mce public: UniformMetaData(); - unsigned int getSize() const; + size_t getSize() const; }; } diff --git a/source/renderer/hal/base/ConstantBufferContainerBase.cpp b/source/renderer/hal/base/ConstantBufferContainerBase.cpp index 134071df5..716f84d17 100644 --- a/source/renderer/hal/base/ConstantBufferContainerBase.cpp +++ b/source/renderer/hal/base/ConstantBufferContainerBase.cpp @@ -49,7 +49,7 @@ void ConstantBufferContainerBase::_move(ConstantBufferContainerBase& other) other.m_bWriteEnabled = temp; } -void ConstantBufferContainerBase::reserveMemoryForShaderConstants(unsigned int shaderConstSize, unsigned int constBufferSize) +void ConstantBufferContainerBase::reserveMemoryForShaderConstants(size_t shaderConstSize, size_t constBufferSize) { m_shaderConstants->reserve(shaderConstSize); m_constantBufferBytes->resize(constBufferSize); diff --git a/source/renderer/hal/base/ConstantBufferContainerBase.hpp b/source/renderer/hal/base/ConstantBufferContainerBase.hpp index b14d97f54..59c5f023a 100644 --- a/source/renderer/hal/base/ConstantBufferContainerBase.hpp +++ b/source/renderer/hal/base/ConstantBufferContainerBase.hpp @@ -31,11 +31,11 @@ namespace mce void _move(ConstantBufferContainerBase& other); public: - void bindConstantBuffer(RenderContext& context, unsigned int, unsigned int) { } + void bindConstantBuffer(RenderContext& context, size_t, size_t) { } void sync(RenderContext& context) { } void allocateRenderContextBuffer(RenderContext& context) { } - void reserveMemoryForShaderConstants(unsigned int shaderConstSize, unsigned int constBufferSize); + void reserveMemoryForShaderConstants(size_t shaderConstSize, size_t constBufferSize); void registerReflectedShaderParameter(const UniformMetaData& uniMeta); void registerShaderParameter(const ShaderConstantBase &shaderConst); void finalizeConstantBufferLayout(); diff --git a/source/renderer/hal/base/ShaderConstantBase.hpp b/source/renderer/hal/base/ShaderConstantBase.hpp index c8c86dc11..cd0cb2c62 100644 --- a/source/renderer/hal/base/ShaderConstantBase.hpp +++ b/source/renderer/hal/base/ShaderConstantBase.hpp @@ -11,8 +11,8 @@ namespace mce { public: std::string m_name; - unsigned int m_numberOfElements; - unsigned int m_byteOffset; + size_t m_numberOfElements; + size_t m_byteOffset; ShaderPrimitiveTypes m_shaderPrimitiveType; bool m_dirty; @@ -26,7 +26,7 @@ namespace mce void release(); const std::string& getName() const { return m_name; } - unsigned int getSize() const { return ShaderPrimitiveTypeHelper::sizeInBytesFromShaderPrimitiveType(m_shaderPrimitiveType); } + size_t getSize() const { return ShaderPrimitiveTypeHelper::sizeInBytesFromShaderPrimitiveType(m_shaderPrimitiveType); } ShaderPrimitiveTypes getType() const { return m_shaderPrimitiveType; } bool isDirty() const { return m_dirty; } diff --git a/source/renderer/hal/enums/RenderStateType_JsonParser.cpp b/source/renderer/hal/enums/RenderStateType_JsonParser.cpp index 5ff418711..799e87f00 100644 --- a/source/renderer/hal/enums/RenderStateType_JsonParser.cpp +++ b/source/renderer/hal/enums/RenderStateType_JsonParser.cpp @@ -3,6 +3,22 @@ namespace mce { + static std::map _CreateRenderStateTypeMap() + { + std::map m; + m["DisableDepthTest"] = RS_DISABLE_DEPTH_TEST; + m["Blending"] = RS_BLENDING; + m["PolygonOffset"] = RS_POLYGON_OFFSET; + m["DisableCulling"] = RS_DISABLE_CULLING; + m["DisableColorWrite"] = RS_DISABLE_COLOR_WRITE; + m["DisableDepthWrite"] = RS_DISABLE_DEPTH_WRITE; + m["StencilWrite"] = RS_STENCIL_WRITE; + m["InvertCulling"] = RS_INVERT_CULLING; + m["EnableStencilTest"] = RS_ENABLE_STENCIL_TEST; + m["EnableAlphaTest"] = RS_ENABLE_ALPHA_TEST; + m["Textured"] = RS_ENABLE_TEXTURE; + return m; + } template <> bool parse(const rapidjson::Value& root, const std::string& name, RenderStateType& out) @@ -10,4 +26,5 @@ namespace mce return parse(root, name, _renderStateTypeMap, out); } + const std::map _renderStateTypeMap = _CreateRenderStateTypeMap(); } diff --git a/source/renderer/hal/enums/RenderStateType_JsonParser.hpp b/source/renderer/hal/enums/RenderStateType_JsonParser.hpp index 2f0f40600..fd6b908b4 100644 --- a/source/renderer/hal/enums/RenderStateType_JsonParser.hpp +++ b/source/renderer/hal/enums/RenderStateType_JsonParser.hpp @@ -6,21 +6,5 @@ namespace mce { - std::map _CreateRenderStateTypeMap() - { - std::map m; - m["DisableDepthTest"] = RS_DISABLE_DEPTH_TEST; - m["Blending"] = RS_BLENDING; - m["PolygonOffset"] = RS_POLYGON_OFFSET; - m["DisableCulling"] = RS_DISABLE_CULLING; - m["DisableColorWrite"] = RS_DISABLE_COLOR_WRITE; - m["DisableDepthWrite"] = RS_DISABLE_DEPTH_WRITE; - m["StencilWrite"] = RS_STENCIL_WRITE; - m["InvertCulling"] = RS_INVERT_CULLING; - m["EnableStencilTest"] = RS_ENABLE_STENCIL_TEST; - m["EnableAlphaTest"] = RS_ENABLE_ALPHA_TEST; - m["Textured"] = RS_ENABLE_TEXTURE; - return m; - } - const std::map _renderStateTypeMap = _CreateRenderStateTypeMap(); + extern const std::map _renderStateTypeMap; } diff --git a/source/renderer/hal/enums/ShaderPrimitiveTypes.cpp b/source/renderer/hal/enums/ShaderPrimitiveTypes.cpp index 5428e8717..dbb13446e 100644 --- a/source/renderer/hal/enums/ShaderPrimitiveTypes.cpp +++ b/source/renderer/hal/enums/ShaderPrimitiveTypes.cpp @@ -4,7 +4,7 @@ using namespace mce; -int ShaderPrimitiveTypeHelper::sizeInBytesFromShaderPrimitiveType(ShaderPrimitiveTypes shaderPrimitiveType) +size_t ShaderPrimitiveTypeHelper::sizeInBytesFromShaderPrimitiveType(ShaderPrimitiveTypes shaderPrimitiveType) { switch (shaderPrimitiveType) { diff --git a/source/renderer/hal/enums/ShaderPrimitiveTypes.hpp b/source/renderer/hal/enums/ShaderPrimitiveTypes.hpp index a870e3d02..d4fef33ca 100644 --- a/source/renderer/hal/enums/ShaderPrimitiveTypes.hpp +++ b/source/renderer/hal/enums/ShaderPrimitiveTypes.hpp @@ -29,7 +29,7 @@ namespace mce class ShaderPrimitiveTypeHelper { public: - static int sizeInBytesFromShaderPrimitiveType(ShaderPrimitiveTypes shaderPrimitiveType); + static size_t sizeInBytesFromShaderPrimitiveType(ShaderPrimitiveTypes shaderPrimitiveType); }; MC_UNUSED static const char* ShaderPrimitiveTypeToString[] = { From c8db81e564dabe47994248c179b86cbbdd712f0e Mon Sep 17 00:00:00 2001 From: Matt <97983689+bluepilledgreat@users.noreply.github.com> Date: Tue, 12 May 2026 20:21:15 +0100 Subject: [PATCH 2/2] fix size_t not being defined --- source/renderer/hal/enums/ShaderPrimitiveTypes.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/source/renderer/hal/enums/ShaderPrimitiveTypes.hpp b/source/renderer/hal/enums/ShaderPrimitiveTypes.hpp index d4fef33ca..59c555bee 100644 --- a/source/renderer/hal/enums/ShaderPrimitiveTypes.hpp +++ b/source/renderer/hal/enums/ShaderPrimitiveTypes.hpp @@ -1,6 +1,7 @@ #pragma once #include "compat/Unused.hpp" +#include namespace mce {