Made shader comments meaningful

Change-Id: I5a621f955b1001faec01773c3c5623ab3ceb7bc2

diff --git a/dali-toolkit/internal/graphics/shaders/motion-stretch-effect.frag b/dali-toolkit/internal/graphics/shaders/motion-stretch-effect.frag
index ad55ae0988401070fdd72cd80a6c2f7edf7274ef..86c2fcff9e76e308f8b852858e8fe4a1a9fe758c 100644 (file)
--- a/dali-toolkit/internal/graphics/shaders/motion-stretch-effect.frag
+++ b/dali-toolkit/internal/graphics/shaders/motion-stretch-effect.frag
@@ -9,14 +9,14 @@ UNIFORM_BLOCK FragBlock
 {
   UNIFORM vec4 uColor;
 
-  UNIFORM vec2 uObjectFadeStart;//@blah
-  UNIFORM vec2 uObjectFadeEnd;//@input
-  UNIFORM float uAlphaScale;//@output
+  UNIFORM vec2 uObjectFadeStart;
+  UNIFORM vec2 uObjectFadeEnd;
+  UNIFORM float uAlphaScale; // Global alpha scale
 };
 
 // inputs
-INPUT vec2 vModelSpaceCenterToPos;//@version
-INPUT vec2 vScreenSpaceVelocityVector; //@Notjhing
+INPUT vec2 vModelSpaceCenterToPos; // 2d, ignoring z
+INPUT vec2 vScreenSpaceVelocityVector;
 INPUT float vSpeed;
 INPUT vec2 vTexCoord;
 

diff --git a/dali-toolkit/internal/graphics/shaders/motion-stretch-effect.vert b/dali-toolkit/internal/graphics/shaders/motion-stretch-effect.vert
index 9fba6a2b4dc6af6a3275a24fa9cbb146daaff934..61a64372fc42cd1e718ba6e01b2754ea06f4e074 100644 (file)
--- a/dali-toolkit/internal/graphics/shaders/motion-stretch-effect.vert
+++ b/dali-toolkit/internal/graphics/shaders/motion-stretch-effect.vert
@@ -4,7 +4,7 @@
 
 precision mediump float;
 
-INPUT vec2 aPosition;//Stuff, things
+INPUT vec2 aPosition; // Use position to calculate uvs
 
 UNIFORM_BLOCK VertBlock
 {
@@ -24,7 +24,7 @@ float timeDelta = 0.0167;
 
 
 // outputs
-OUTPUT vec2 vModelSpaceCenterToPos;
+OUTPUT vec2 vModelSpaceCenterToPos; // 2d, ignoring z
 OUTPUT vec2 vScreenSpaceVelocityVector;
 OUTPUT float vSpeed;
 OUTPUT vec2 vTexCoord;

diff --git a/dali-toolkit/internal/particle-system/particle-renderer-impl.cpp b/dali-toolkit/internal/particle-system/particle-renderer-impl.cpp
index 123fa66ac03b38dce6f08009f950538c58b087ab..1176190981ebccc66bd4a142da4d084cdbe21e83 100644 (file)
--- a/dali-toolkit/internal/particle-system/particle-renderer-impl.cpp
+++ b/dali-toolkit/internal/particle-system/particle-renderer-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 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.
@@ -127,15 +127,17 @@ void ParticleRenderer::CreateShader()
    * - ParticleSystem buffer is being updated every frame
    */
   std::string vertexShaderCode = streamAttributesStr + std::string(
-
-                                                         "INPUT mediump vec2 aPosition;\n\
+                                                         "//@version 100\n\
+      INPUT mediump vec2 aPosition;\n\
       INPUT mediump vec2 aTexCoords;\n\
       \n\
-      uniform mediump mat4   uMvpMatrix;\n\
-      uniform mediump vec3   uSize;\n\
-      uniform lowp vec4      uColor;\n\
-      \
-      OUTPUT mediump vec2   vTexCoord;\n\
+      UNIFORM_BLOCK VertBlock \n\
+      {\n\
+      UNIFORM mediump mat4   uMvpMatrix;\n\
+      UNIFORM mediump vec3   uSize;\n\
+      UNIFORM lowp vec4      uColor;\n\
+      };\n\
+      OUTPUT mediump vec2 vTexCoord;\n\
       OUTPUT mediump vec4 vColor;\n\
       \n\
       void main()\n\
@@ -148,17 +150,17 @@ void ParticleRenderer::CreateShader()
       }\n");
 
   std::string fragmentShaderCode =
-    {
-      "INPUT mediump vec2       vTexCoord;\n\
-    INPUT mediump vec4       vColor;\n\
-    uniform sampler2D sTexture;\n\
-    \n\
-    void main()\n\
-    {\n\
-      lowp vec4 col = TEXTURE(sTexture, vTexCoord) * vColor;\n\
-      if(col.a < 0.1) { discard; }\
-      fragColor = col;\n\
-    }\n"};
+    {"//@version 100\n\
+      INPUT mediump vec2       vTexCoord;\n\
+      INPUT mediump vec4       vColor;\n\
+      UNIFORM sampler2D sTexture;\n\
+      \n\
+      void main()\n\
+      {\n\
+        lowp vec4 col = TEXTURE(sTexture, vTexCoord) * vColor;\n\
+        if(col.a < 0.1) { discard; }\
+        gl_FragColor = col;\n\
+      }\n"};
 
   mShader   = Shader::New(Dali::Shader::GetVertexShaderPrefix() + vertexShaderCode, Dali::Shader::GetFragmentShaderPrefix() + fragmentShaderCode);
   mGeometry = Geometry::New();