Fix FLAT qualifier ordering issue + Support gles2.0 YUV image

FLAT keyword must be defined before in/out
+
Fix shader compile error when we try to rendering YUV image at gles2.0

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

diff --git a/dali-scene3d/internal/graphics/shaders/default-physically-based-shader.frag b/dali-scene3d/internal/graphics/shaders/default-physically-based-shader.frag
index c357696b8c065a1a641d64c6742cf4e9ee202cdf..e5a6f2e30883f44d79d8cc5edbfa9f0a87d8fead 100644 (file)
--- a/dali-scene3d/internal/graphics/shaders/default-physically-based-shader.frag
+++ b/dali-scene3d/internal/graphics/shaders/default-physically-based-shader.frag
@@ -148,7 +148,7 @@ UNIFORM_BLOCK ShadowEnabled
 
 // TODO: Multiple texture coordinate will be supported.
 INPUT mediump vec2 vUV;
-INPUT lowp mat3 vTBN;
+INPUT highp mat3 vTBN;
 INPUT lowp vec4 vColor;
 INPUT highp vec3 vPositionToCamera;
 INPUT highp vec3 positionFromLightView;

diff --git a/dali-scene3d/internal/graphics/shaders/scene3d-joint-debug.frag b/dali-scene3d/internal/graphics/shaders/scene3d-joint-debug.frag
index 3a4cbc833b8c30c06f5e2fcb687c5b29ce832c93..2a5c4e3e05d8d34bffe4cc44418e5c83dee488a7 100644 (file)
--- a/dali-scene3d/internal/graphics/shaders/scene3d-joint-debug.frag
+++ b/dali-scene3d/internal/graphics/shaders/scene3d-joint-debug.frag
@@ -5,7 +5,7 @@ UNIFORM_BLOCK FragBlock
 {
   UNIFORM lowp vec4 uColor;
 };
-INPUT flat float vColor;
+FLAT INPUT float vColor;
 
 void main()
 {

diff --git a/dali-scene3d/internal/graphics/shaders/scene3d-joint-debug.vert b/dali-scene3d/internal/graphics/shaders/scene3d-joint-debug.vert
index eef29cc4072550ec2e7887485f5bdba97e5f2d39..3c03ef6ea1791f6677eedbfce9dbec2b0288c8e8 100644 (file)
--- a/dali-scene3d/internal/graphics/shaders/scene3d-joint-debug.vert
+++ b/dali-scene3d/internal/graphics/shaders/scene3d-joint-debug.vert
@@ -7,7 +7,7 @@ UNIFORM_BLOCK VertBlock
 };
 INPUT vec3 aPosition;
 INPUT float aColor;
-OUTPUT flat float vColor;
+FLAT OUTPUT float vColor;
 
 void main()
 {

diff --git a/dali-toolkit/internal/graphics/shaders/color-visual-shader.frag b/dali-toolkit/internal/graphics/shaders/color-visual-shader.frag
index 8c17ae5d89050774ac096fabaff7ab531cac50cb..044494beae60f88c51f843e401fa0f7a5932efff 100644 (file)
--- a/dali-toolkit/internal/graphics/shaders/color-visual-shader.frag
+++ b/dali-toolkit/internal/graphics/shaders/color-visual-shader.frag
@@ -4,17 +4,17 @@
 
 #if defined(IS_REQUIRED_ROUNDED_CORNER) || defined(IS_REQUIRED_BORDERLINE) || defined(IS_REQUIRED_BLUR)
 INPUT highp vec2 vPosition;
-INPUT flat highp vec2 vRectSize;
-INPUT flat highp vec2 vOptRectSize;
-INPUT flat highp float vAliasMargin;
+FLAT INPUT highp vec2 vRectSize;
+FLAT INPUT highp vec2 vOptRectSize;
+FLAT INPUT highp float vAliasMargin;
 #ifdef IS_REQUIRED_ROUNDED_CORNER
-INPUT flat highp vec4 vCornerRadius;
+FLAT INPUT highp vec4 vCornerRadius;
 #endif
 #endif
 #if defined(IS_REQUIRED_CUTOUT)
 INPUT highp vec2 vPositionFromCenter;
 #if defined(IS_REQUIRED_ROUNDED_CORNER)
-INPUT flat highp vec4 vCutoutCornerRadius;
+FLAT INPUT highp vec4 vCutoutCornerRadius;
 #endif
 #endif
 

diff --git a/dali-toolkit/internal/graphics/shaders/color-visual-shader.vert b/dali-toolkit/internal/graphics/shaders/color-visual-shader.vert
index e2c21da1d02692ade88f634e2ee57347dbfbe205..98abcec0965b039e72e55bcda037456cdefe6268 100644 (file)
--- a/dali-toolkit/internal/graphics/shaders/color-visual-shader.vert
+++ b/dali-toolkit/internal/graphics/shaders/color-visual-shader.vert
@@ -5,17 +5,17 @@
 INPUT mediump vec2 aPosition;
 #if defined(IS_REQUIRED_ROUNDED_CORNER) || defined(IS_REQUIRED_BORDERLINE) || defined(IS_REQUIRED_BLUR)
 OUTPUT highp vec2 vPosition;
-OUTPUT flat highp vec2 vRectSize;
-OUTPUT flat highp vec2 vOptRectSize;
-OUTPUT flat highp float vAliasMargin;
+FLAT OUTPUT highp vec2 vRectSize;
+FLAT OUTPUT highp vec2 vOptRectSize;
+FLAT OUTPUT highp float vAliasMargin;
 #ifdef IS_REQUIRED_ROUNDED_CORNER
-OUTPUT flat highp vec4 vCornerRadius;
+FLAT OUTPUT highp vec4 vCornerRadius;
 #endif
 #endif
 #if defined(IS_REQUIRED_CUTOUT)
 OUTPUT highp vec2 vPositionFromCenter;
 #if defined(IS_REQUIRED_ROUNDED_CORNER)
-OUTPUT flat highp vec4 vCutoutCornerRadius;
+FLAT OUTPUT highp vec4 vCutoutCornerRadius;
 #endif
 #endif
 

diff --git a/dali-toolkit/internal/graphics/shaders/gradient-visual-shader.frag b/dali-toolkit/internal/graphics/shaders/gradient-visual-shader.frag
index 30424bae26c2e33c5898de789aca8a64f7ea6db4..561ce4e2e26d605fe18240fb5ef01d592a869bba 100644 (file)
--- a/dali-toolkit/internal/graphics/shaders/gradient-visual-shader.frag
+++ b/dali-toolkit/internal/graphics/shaders/gradient-visual-shader.frag
@@ -5,11 +5,11 @@
 INPUT mediump vec2 vTexCoord;
 #if defined(IS_REQUIRED_ROUNDED_CORNER) || defined(IS_REQUIRED_BORDERLINE)
 INPUT highp vec2 vPosition;
-INPUT flat highp vec2 vRectSize;
-INPUT flat highp vec2 vOptRectSize;
-INPUT flat highp float vAliasMargin;
+FLAT INPUT highp vec2 vRectSize;
+FLAT INPUT highp vec2 vOptRectSize;
+FLAT INPUT highp float vAliasMargin;
 #ifdef IS_REQUIRED_ROUNDED_CORNER
-INPUT flat highp vec4 vCornerRadius;
+FLAT INPUT highp vec4 vCornerRadius;
 #endif
 #endif
 

diff --git a/dali-toolkit/internal/graphics/shaders/gradient-visual-shader.vert b/dali-toolkit/internal/graphics/shaders/gradient-visual-shader.vert
index 06ec2bc0fc4abbbc999416c24d799aa071b62a51..ad27699776bbfb034f9a4eaec0ec7d6f714003fa 100644 (file)
--- a/dali-toolkit/internal/graphics/shaders/gradient-visual-shader.vert
+++ b/dali-toolkit/internal/graphics/shaders/gradient-visual-shader.vert
@@ -6,11 +6,11 @@ INPUT mediump vec2 aPosition;
 OUTPUT mediump vec2 vTexCoord;
 #if defined(IS_REQUIRED_ROUNDED_CORNER) || defined(IS_REQUIRED_BORDERLINE)
 OUTPUT highp vec2 vPosition;
-OUTPUT flat highp vec2 vRectSize;
-OUTPUT flat highp vec2 vOptRectSize;
-OUTPUT flat highp float vAliasMargin;
+FLAT OUTPUT highp vec2 vRectSize;
+FLAT OUTPUT highp vec2 vOptRectSize;
+FLAT OUTPUT highp float vAliasMargin;
 #ifdef IS_REQUIRED_ROUNDED_CORNER
-OUTPUT flat highp vec4 vCornerRadius;
+FLAT OUTPUT highp vec4 vCornerRadius;
 #endif
 #endif
 

diff --git a/dali-toolkit/internal/graphics/shaders/image-visual-shader.frag b/dali-toolkit/internal/graphics/shaders/image-visual-shader.frag
index dbf5a7630986172ee23c6e5d0cabdf0829da0b11..1a8198c17c418b50172e559d9238087750b28018 100644 (file)
--- a/dali-toolkit/internal/graphics/shaders/image-visual-shader.frag
+++ b/dali-toolkit/internal/graphics/shaders/image-visual-shader.frag
@@ -1,13 +1,15 @@
+//@name image-visual-shader.frag
+
 //@version 100
 
 INPUT mediump vec2 vTexCoord;
 #if defined(IS_REQUIRED_DEBUG_VISUAL_SHADER) || defined(IS_REQUIRED_ROUNDED_CORNER) || defined(IS_REQUIRED_BORDERLINE)
 INPUT highp vec2 vPosition;
-INPUT flat highp vec2 vRectSize;
-INPUT flat highp vec2 vOptRectSize;
-INPUT flat highp float vAliasMargin;
+FLAT INPUT highp vec2 vRectSize;
+FLAT INPUT highp vec2 vOptRectSize;
+FLAT INPUT highp float vAliasMargin;
 #ifdef IS_REQUIRED_ROUNDED_CORNER
-INPUT flat highp vec4 vCornerRadius;
+FLAT INPUT highp vec4 vCornerRadius;
 #endif
 #endif
 #ifdef IS_REQUIRED_DEBUG_VISUAL_SHADER
@@ -297,9 +299,9 @@ lowp vec4 ConvertYuvToRgba(mediump vec2 texCoord)
   }
 #endif
 
-  lowp float y = texture(sTexture, texCoord).r;
-  lowp float u = texture(sTextureU, texCoord).r - 0.5;
-  lowp float v = texture(sTextureV, texCoord).r - 0.5;
+  lowp float y = TEXTURE(sTexture, texCoord).r;
+  lowp float u = TEXTURE(sTextureU, texCoord).r - 0.5;
+  lowp float v = TEXTURE(sTextureV, texCoord).r - 0.5;
   lowp vec4 rgba;
   rgba.r = y + (1.403 * v);
   rgba.g = y - (0.344 * u) - (0.714 * v);

diff --git a/dali-toolkit/internal/graphics/shaders/image-visual-shader.vert b/dali-toolkit/internal/graphics/shaders/image-visual-shader.vert
index 7d6daada526a846b450eff6ccf9a0972be49c321..9859b9bcf63bbfaf4f5759260190cea3928a29e0 100644 (file)
--- a/dali-toolkit/internal/graphics/shaders/image-visual-shader.vert
+++ b/dali-toolkit/internal/graphics/shaders/image-visual-shader.vert
@@ -1,14 +1,16 @@
+//@name image-visual-shader.vert
+
 //@version 100
 
 INPUT mediump vec2 aPosition;
 OUTPUT mediump vec2 vTexCoord;
 #if defined(IS_REQUIRED_DEBUG_VISUAL_SHADER) || defined(IS_REQUIRED_ROUNDED_CORNER) || defined(IS_REQUIRED_BORDERLINE)
 OUTPUT highp vec2 vPosition;
-OUTPUT flat highp vec2 vRectSize;
-OUTPUT flat highp vec2 vOptRectSize;
-OUTPUT flat highp float vAliasMargin;
+FLAT OUTPUT highp vec2 vRectSize;
+FLAT OUTPUT highp vec2 vOptRectSize;
+FLAT OUTPUT highp float vAliasMargin;
 #ifdef IS_REQUIRED_ROUNDED_CORNER
-OUTPUT flat highp vec4 vCornerRadius;
+FLAT OUTPUT highp vec4 vCornerRadius;
 #endif
 #endif