Added element_count for sampler uniform arrays.

Graphics interface didn't differentiate between non-array uniforms
and uniform array elements. Added element_count to show that.

(Used mainly in graphics backend implementation).

Change-Id: I7f3d9eead85dc029e93337c88bb38de1ce3e2fa5

diff --git a/dali/graphics-api/graphics-reflection.h b/dali/graphics-api/graphics-reflection.h
index b6e187bb0be4cd8efec42560312a2fbf71cdea90..5203c653c7577f484ea7e62b6879bfd737b46d19 100644 (file)
--- a/dali/graphics-api/graphics-reflection.h
+++ b/dali/graphics-api/graphics-reflection.h
@@ -2,7 +2,7 @@
 #define DALI_GRAPHICS_REFLECTION_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -166,7 +166,9 @@ public:
   // Sampler
 
   /**
-   * @brief Gets all the sampler uniforms
+   * @brief Gets all the sampler uniforms. In the case of arrays of samplers,
+   * it contains only the name of the sampler array without the [N] size, but,
+   * the element count is set to N.
    *
    * @return A vector of the sampler uniforms
    */

diff --git a/dali/graphics-api/graphics-types.h b/dali/graphics-api/graphics-types.h
index 6d6eb406dfc82e8bc0a4a3f2dd474b98526fa35b..45b8e6fb047581f2cff7628d6e33eb3b0ad51ff6 100644 (file)
--- a/dali/graphics-api/graphics-types.h
+++ b/dali/graphics-api/graphics-types.h
@@ -1150,6 +1150,7 @@ struct UniformInfo
   uint32_t     bufferIndex{0u};
   uint32_t     offset{0u};
   uint32_t     location{0u};
+  uint32_t     elementCount{0u};
 
   bool operator==(const UniformInfo& rhs)
   {
@@ -1158,7 +1159,8 @@ struct UniformInfo
            binding == rhs.binding &&
            bufferIndex == rhs.bufferIndex &&
            offset == rhs.offset &&
-           location == rhs.location;
+           location == rhs.location &&
+           elementCount == rhs.elementCount;
   }
 };
 

diff --git a/dali/internal/render/shaders/program.cpp b/dali/internal/render/shaders/program.cpp
index 4cfbcb4973ee6c9d29ad239e41d3f7b626576160..f6d9f9786f82dfffc42c3e7388f680fab99bbbea 100644 (file)
--- a/dali/internal/render/shaders/program.cpp
+++ b/dali/internal/render/shaders/program.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -143,7 +143,7 @@ void Program::BuildReflection(const Graphics::Reflection& graphicsReflection)
   }
 
   // add samplers
-  auto samplers = graphicsReflection.GetSamplers();
+  auto samplers = graphicsReflection.GetSamplers(); // Only holds first element of arrays without [].
   for(const auto& sampler : samplers)
   {
     mReflection.emplace_back(ReflectionUniformInfo{CalculateHash(sampler.name), false, sampler});