From e70e3f3e69bac29e46d27e094aca154a4f746673 Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Tue, 25 Oct 2022 15:16:14 +0900 Subject: [PATCH] Fix SVACE issue SIGNED_TO_BIGGER_UNSIGNED Change-Id: Ieccc224f0cd0533ee51386b3a65aee2ede324ef7 --- dali/internal/render/renderers/render-renderer.cpp | 10 +++++----- dali/internal/render/renderers/render-renderer.h | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dali/internal/render/renderers/render-renderer.cpp b/dali/internal/render/renderers/render-renderer.cpp index 105b496..11a83d0 100644 --- a/dali/internal/render/renderers/render-renderer.cpp +++ b/dali/internal/render/renderers/render-renderer.cpp @@ -556,7 +556,7 @@ bool Renderer::Render(Graphics::CommandBuffer& comma BindTextures(commandBuffer, boundTextures); - int nodeIndex = BuildUniformIndexMap(bufferIndex, node, size, *program); + std::size_t nodeIndex = BuildUniformIndexMap(bufferIndex, node, size, *program); WriteUniformBuffer(bufferIndex, commandBuffer, program, instruction, node, modelMatrix, modelViewMatrix, viewMatrix, projectionMatrix, size, nodeIndex); @@ -579,7 +579,7 @@ bool Renderer::Render(Graphics::CommandBuffer& comma return drawn; } -int Renderer::BuildUniformIndexMap(BufferIndex bufferIndex, const SceneGraph::NodeDataProvider& node, const Vector3& size, Program& program) +std::size_t Renderer::BuildUniformIndexMap(BufferIndex bufferIndex, const SceneGraph::NodeDataProvider& node, const Vector3& size, Program& program) { // Check if the map has changed DALI_ASSERT_DEBUG(mRenderDataProvider && "No Uniform map data provider available"); @@ -602,7 +602,7 @@ int Renderer::BuildUniformIndexMap(BufferIndex bufferIndex, const SceneGraph::No auto iter = std::find_if(mNodeIndexMap.begin(), mNodeIndexMap.end(), [nodePtr](RenderItemLookup& element) { return element.node == nodePtr; }); - int renderItemMapIndex; + std::size_t renderItemMapIndex; if(iter == mNodeIndexMap.end()) { renderItemMapIndex = mUniformIndexMaps.size(); @@ -693,7 +693,7 @@ void Renderer::WriteUniformBuffer( const Matrix& viewMatrix, const Matrix& projectionMatrix, const Vector3& size, - int nodeIndex) + std::size_t nodeIndex) { // Create the UBO uint32_t uboOffset{0u}; @@ -797,7 +797,7 @@ void Renderer::FillUniformBuffer(Program& p std::vector*& outBindings, uint32_t& offset, BufferIndex updateBufferIndex, - int nodeIndex) + std::size_t nodeIndex) { auto& reflection = mGraphicsController->GetProgramReflection(program.GetGraphicsProgram()); auto uboCount = reflection.GetUniformBlockCount(); diff --git a/dali/internal/render/renderers/render-renderer.h b/dali/internal/render/renderers/render-renderer.h index b99ac4e..d548efc 100644 --- a/dali/internal/render/renderers/render-renderer.h +++ b/dali/internal/render/renderers/render-renderer.h @@ -468,7 +468,7 @@ private: * * @return the index of the node in change counters store / uniform maps store. */ - int BuildUniformIndexMap(BufferIndex bufferIndex, const SceneGraph::NodeDataProvider& node, const Vector3& size, Program& program); + std::size_t BuildUniformIndexMap(BufferIndex bufferIndex, const SceneGraph::NodeDataProvider& node, const Vector3& size, Program& program); /** * Bind the textures and setup the samplers @@ -515,7 +515,7 @@ private: const Matrix& viewMatrix, const Matrix& projectionMatrix, const Vector3& size, - int nodeIndex); + std::size_t nodeIndex); /** * @brief Fill uniform buffer at index. Writes uniforms into given memory address @@ -532,7 +532,7 @@ private: std::vector*& outBindings, uint32_t& offset, BufferIndex updateBufferIndex, - int nodeIndex); + std::size_t nodeIndex); private: Graphics::Controller* mGraphicsController; -- 2.7.4