From a5c336b929b580dba652ee166d5c34126bc158b4 Mon Sep 17 00:00:00 2001 From: Adam Bialogonski Date: Tue, 6 Jul 2021 15:32:47 +0100 Subject: [PATCH] Reflection GetSamplers() returns const ref Change-Id: I41dfbc9269f375c193d5f9c1c6d56d74c64368ca --- .../test-graphics-reflection.cpp | 5 ++-- .../test-graphics-reflection.h | 32 +++++++++++----------- dali/graphics-api/graphics-reflection.h | 2 +- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-graphics-reflection.cpp b/automated-tests/src/dali/dali-test-suite-utils/test-graphics-reflection.cpp index d59f29f..8493992 100644 --- a/automated-tests/src/dali/dali-test-suite-utils/test-graphics-reflection.cpp +++ b/automated-tests/src/dali/dali-test-suite-utils/test-graphics-reflection.cpp @@ -240,9 +240,10 @@ bool TestGraphicsReflection::GetNamedUniform(const std::string& name, Dali::Grap return true; } -std::vector TestGraphicsReflection::GetSamplers() const +const std::vector& TestGraphicsReflection::GetSamplers() const { - return std::vector{}; + static std::vector samplers{}; + return samplers; } Graphics::ShaderLanguage TestGraphicsReflection::GetLanguage() const diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-graphics-reflection.h b/automated-tests/src/dali/dali-test-suite-utils/test-graphics-reflection.h index 7af052e..2147cae 100644 --- a/automated-tests/src/dali/dali-test-suite-utils/test-graphics-reflection.h +++ b/automated-tests/src/dali/dali-test-suite-utils/test-graphics-reflection.h @@ -28,22 +28,22 @@ class TestGraphicsReflection : public Graphics::Reflection public: TestGraphicsReflection(TestGlAbstraction& gl, Property::Array& vertexFormats, const Graphics::ProgramCreateInfo& createInfo, std::vector& customUniforms); - uint32_t GetVertexAttributeLocation(const std::string& name) const override; - Dali::Graphics::VertexInputAttributeFormat GetVertexAttributeFormat(uint32_t location) const override; - std::string GetVertexAttributeName(uint32_t location) const override; - std::vector GetVertexAttributeLocations() const override; - uint32_t GetUniformBlockCount() const override; - uint32_t GetUniformBlockBinding(uint32_t index) const override; - uint32_t GetUniformBlockSize(uint32_t index) const override; - bool GetUniformBlock(uint32_t index, Dali::Graphics::UniformBlockInfo& out) const override; - std::vector GetUniformBlockLocations() const override; - std::string GetUniformBlockName(uint32_t blockIndex) const override; - uint32_t GetUniformBlockMemberCount(uint32_t blockIndex) const override; - std::string GetUniformBlockMemberName(uint32_t blockIndex, uint32_t memberLocation) const override; - uint32_t GetUniformBlockMemberOffset(uint32_t blockIndex, uint32_t memberLocation) const override; - bool GetNamedUniform(const std::string& name, Dali::Graphics::UniformInfo& out) const override; - std::vector GetSamplers() const override; - Graphics::ShaderLanguage GetLanguage() const override; + uint32_t GetVertexAttributeLocation(const std::string& name) const override; + Dali::Graphics::VertexInputAttributeFormat GetVertexAttributeFormat(uint32_t location) const override; + std::string GetVertexAttributeName(uint32_t location) const override; + std::vector GetVertexAttributeLocations() const override; + uint32_t GetUniformBlockCount() const override; + uint32_t GetUniformBlockBinding(uint32_t index) const override; + uint32_t GetUniformBlockSize(uint32_t index) const override; + bool GetUniformBlock(uint32_t index, Dali::Graphics::UniformBlockInfo& out) const override; + std::vector GetUniformBlockLocations() const override; + std::string GetUniformBlockName(uint32_t blockIndex) const override; + uint32_t GetUniformBlockMemberCount(uint32_t blockIndex) const override; + std::string GetUniformBlockMemberName(uint32_t blockIndex, uint32_t memberLocation) const override; + uint32_t GetUniformBlockMemberOffset(uint32_t blockIndex, uint32_t memberLocation) const override; + bool GetNamedUniform(const std::string& name, Dali::Graphics::UniformInfo& out) const override; + const std::vector& GetSamplers() const override; + Graphics::ShaderLanguage GetLanguage() const override; public: // Test methods void SetAttributes(std::vector locations) diff --git a/dali/graphics-api/graphics-reflection.h b/dali/graphics-api/graphics-reflection.h index e2a07a8..b6e187b 100644 --- a/dali/graphics-api/graphics-reflection.h +++ b/dali/graphics-api/graphics-reflection.h @@ -170,7 +170,7 @@ public: * * @return A vector of the sampler uniforms */ - virtual std::vector GetSamplers() const = 0; + virtual const std::vector& GetSamplers() const = 0; // Language -- 2.7.4