Make UniformBlockExample use Dali::UniformBlock

Let we make uColorArray as shared uniform, so
make we don't allocate and register for whole 1024 array per each renderer.

Change-Id: If95316620be3857ff55d885df004e89309c86927
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>

diff --git a/examples/uniform-blocks/shaders/uniform-block-alt.frag b/examples/uniform-blocks/shaders/uniform-block-alt.frag
index 6e0192b6cd6a7e3aa3c96d3fc8fae3d1f4619831..eae30f9561cb9c5400bc2feca640ed89bd1db9d0 100644 (file)
--- a/examples/uniform-blocks/shaders/uniform-block-alt.frag
+++ b/examples/uniform-blocks/shaders/uniform-block-alt.frag
@@ -1,9 +1,13 @@
 //@version 100
 
-UNIFORM_BLOCK FragmentBlock
+UNIFORM_BLOCK SharedFragmentBlock
 {
-  UNIFORM lowp vec4 uColor;
   UNIFORM  mediump vec4 uColorArray[1024];
+};
+
+UNIFORM_BLOCK FragmentBlock
+{
+  UNIFORM  lowp vec4 uColor;
   UNIFORM  mediump int uColorIndex;
 };
 

diff --git a/examples/uniform-blocks/shaders/uniform-block.frag b/examples/uniform-blocks/shaders/uniform-block.frag
index 71479353472049de07c76b1a91cb234febca707a..e0ec6cf66722f66b9557174c0e33e32feceb3165 100644 (file)
--- a/examples/uniform-blocks/shaders/uniform-block.frag
+++ b/examples/uniform-blocks/shaders/uniform-block.frag
@@ -1,10 +1,13 @@
 //@version 100
 
+UNIFORM_BLOCK SharedFragmentBlock
+{
+  UNIFORM  mediump vec4 uColorArray[1024];
+};
+
 UNIFORM_BLOCK FragmentBlock
 {
-UNIFORM  lowp vec4 uColor;
-UNIFORM  mediump vec4 uColorArray[1024];
-UNIFORM  mediump int uColorIndex;
+  UNIFORM  mediump int uColorIndex;
 };
 
 void main()

diff --git a/examples/uniform-blocks/uniform-blocks-example.cpp b/examples/uniform-blocks/uniform-blocks-example.cpp
index 34a787198c1ef292f9663b96a0b188766246b2bd..b115b42fbfd5a3cd7149a1fb81ff66f01e980de8 100644 (file)
--- a/examples/uniform-blocks/uniform-blocks-example.cpp
+++ b/examples/uniform-blocks/uniform-blocks-example.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2025 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.
@@ -16,16 +16,15 @@
  */
 
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali/public-api/rendering/uniform-block.h>
 
-#include "generated/uniform-block-vert.h"
-#include "generated/uniform-block-frag.h"
 #include "generated/uniform-block-alt-frag.h"
+#include "generated/uniform-block-frag.h"
+#include "generated/uniform-block-vert.h"
 
 using namespace Dali;
 using Dali::Toolkit::TextLabel;
 
-
-
 /**
  * This application tests that shaders with uniform blocks work as expected.
  */
@@ -48,12 +47,14 @@ public:
     Window window = application.GetWindow();
     window.SetBackgroundColor(Color::WHITE);
 
+    mUniformBlocks = UniformBlock::New("SharedFragmentBlock");
+
     CreateShader(0);
     CreateGeometry();
     CreateRenderer();
     mFirstActor = window.GetRootLayer().GetChildCount();
 
-    for(int i=0; i<200; ++i)
+    for(int i = 0; i < 200; ++i)
     {
       AddActor(i);
     }
@@ -70,30 +71,32 @@ public:
 
   bool OnTick()
   {
-    static int index=200;
-    Window window = mApplication.GetWindow();
-    Layer layer = window.GetRootLayer();
-    Actor child = layer.GetChildAt(mFirstActor);
+    static int index  = 200;
+    Window     window = mApplication.GetWindow();
+    Layer      layer  = window.GetRootLayer();
+    Actor      child  = layer.GetChildAt(mFirstActor);
     UnparentAndReset(child);
     AddActor(index);
-    index = (index+1)%1024;
+    index = (index + 1) % 1024;
     return true;
   }
 
   bool OnTouch(Actor actor, const TouchEvent& touch)
   {
-    static int testNumber=0;
+    static int testNumber = 0;
     if(touch.GetState(0) == PointState::STARTED)
     {
       testNumber++;
-      if(testNumber >=2)
+      if(testNumber >= 2)
+      {
         mApplication.Quit();
+      }
 
       CreateShader(testNumber);
-      mRenderer = Renderer::New(mGeometry, mShader);
+      CreateRenderer();
 
       Actor parent = mApplication.GetWindow().GetRootLayer();
-      for(uint32_t i=0; i<parent.GetChildCount(); ++i)
+      for(uint32_t i = 0; i < parent.GetChildCount(); ++i)
       {
         parent.GetChildAt(i).RemoveRenderer(0);
         parent.GetChildAt(i).AddRenderer(mRenderer);
@@ -118,17 +121,18 @@ public:
     Actor actor = Actor::New();
     actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
     actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
-    actor.SetProperty(Actor::Property::POSITION, Vector3(Random::Range(-200.0f, 200.0f), Random::Range(-300.0f, 300.0f), 0.0f));;
-    actor.SetProperty( Actor::Property::SIZE, Vector2(32, 32) );
-    Vector4 color(Random::Range(0.1f,1.0f),Random::Range(0.1f,1.0f),Random::Range(0.1f,1.0f),1.0f);
-    actor.SetProperty( Actor::Property::COLOR, color);
+    actor.SetProperty(Actor::Property::POSITION, Vector3(Random::Range(-200.0f, 200.0f), Random::Range(-300.0f, 300.0f), 0.0f));
+    actor.SetProperty(Actor::Property::SIZE, Vector2(32, 32));
+    Vector4 color(Random::Range(0.1f, 1.0f), Random::Range(0.1f, 1.0f), Random::Range(0.1f, 1.0f), 1.0f);
+    actor.SetProperty(Actor::Property::COLOR, color);
 
     actor.AddRenderer(mRenderer);
 
     actor.RegisterProperty("uColorIndex", n);
+
     char buffer[80];
     sprintf(buffer, "uColorArray[%d]", n);
-    actor.RegisterProperty(buffer, color);
+    mUniformBlocks.RegisterProperty(buffer, color);
 
     Window window = mApplication.GetWindow();
     window.Add(actor);
@@ -136,8 +140,10 @@ public:
 
   void CreateShader(int testNumber)
   {
-
-
+    if(mShader)
+    {
+      mUniformBlocks.DisconnectFromShader(mShader);
+    }
     // Create shaders
     switch(testNumber)
     {
@@ -154,25 +160,28 @@ public:
         break;
       }
     }
+    mUniformBlocks.ConnectToShader(mShader);
   }
 
   void CreateGeometry()
   {
     struct Vertex2D
     {
-      Vertex2D(const Vector2& _co) :
-        co(_co){}
+      Vertex2D(const Vector2& _co)
+      : co(_co)
+      {
+      }
       Dali::Vector2 co{};
     };
     const static Vector2 C(0.5f, 0.5f);
     struct Quad2D
     {
-      Vertex2D a0{Vector2(0.0f, 0.0f)-C};
-      Vertex2D a1{Vector2(1.0f, 0.0f)-C};
-      Vertex2D a2{Vector2(1.0f, 1.0f)-C};
-      Vertex2D a3{Vector2(0.0f, 0.0f)-C};
-      Vertex2D a4{Vector2(1.0f, 1.0f)-C};
-      Vertex2D a5{Vector2(0.0f, 1.0f)-C};
+      Vertex2D a0{Vector2(0.0f, 0.0f) - C};
+      Vertex2D a1{Vector2(1.0f, 0.0f) - C};
+      Vertex2D a2{Vector2(1.0f, 1.0f) - C};
+      Vertex2D a3{Vector2(0.0f, 0.0f) - C};
+      Vertex2D a4{Vector2(1.0f, 1.0f) - C};
+      Vertex2D a5{Vector2(0.0f, 1.0f) - C};
     } QUAD;
 
     // Create geometry
@@ -181,31 +190,34 @@ public:
     Property::Map attrMap{};
     attrMap.Add("aPosition", Property::Type::VECTOR2);
     VertexBuffer vb = VertexBuffer::New(attrMap);
-    vb.SetData( &QUAD, 6 );
+    vb.SetData(&QUAD, 6);
 
-    geometry.SetType( Geometry::Type::TRIANGLES);
+    geometry.SetType(Geometry::Type::TRIANGLES);
     geometry.AddVertexBuffer(vb);
     mGeometry = geometry;
   }
 
   void CreateRenderer()
   {
-    mRenderer = Renderer::New( mGeometry, mShader);
+    mRenderer = Renderer::New(mGeometry, mShader);
   }
 
 private:
   Application& mApplication;
 
-  Shader mShader;
+  Shader   mShader;
   Geometry mGeometry;
   Renderer mRenderer;
+
+  UniformBlock mUniformBlocks;
+
   uint32_t mFirstActor{0};
-  Timer mTimer;
+  Timer    mTimer;
 };
 
 int DALI_EXPORT_API main(int argc, char** argv)
 {
-  Application          application = Application::New(&argc, &argv);
+  Application             application = Application::New(&argc, &argv);
   UniformBlocksController test(application);
   application.MainLoop();
   return 0;