(AutomatedTests) Fixed build break.

Signed-off-by: Adeel Kazmi <adeel.kazmi@samsung.com>

diff --git a/automated-tests/src/dali-internal/utc-Dali-Internal-Material.cpp b/automated-tests/src/dali-internal/utc-Dali-Internal-Material.cpp
index 40284fa..ffe3794 100644 (file)
--- a/automated-tests/src/dali-internal/utc-Dali-Internal-Material.cpp
+++ b/automated-tests/src/dali-internal/utc-Dali-Internal-Material.cpp
@@ -94,7 +94,7 @@ public:
 
   float GetUniformF(std::string uniform)
   {
-    GLint uniformLoc = program->GetUniformLocation( program->RegisterUniform( uniform ) );
+    GLint uniformLoc = program->GetUniformLocation( program->RegisterUniform( uniform.c_str() ) );
     float value=0.0f;
     if(app.GetGlAbstraction().GetUniformValue( programId, (GLuint) uniformLoc, value))
     {
@@ -105,7 +105,7 @@ public:
 
   Vector4 GetUniformV(std::string uniform)
   {
-    GLint uniformLoc = program->GetUniformLocation( program->RegisterUniform( uniform ) );
+    GLint uniformLoc = program->GetUniformLocation( program->RegisterUniform( uniform.c_str() ) );
     Vector4 value;
     if(app.GetGlAbstraction().GetUniformValue( programId, (GLuint) uniformLoc, value))
     {

diff --git a/automated-tests/src/dali-unmanaged/tct-dali-unmanaged-core.h b/automated-tests/src/dali-unmanaged/tct-dali-unmanaged-core.h
index 69003fe..17a0792 100644 (file)
--- a/automated-tests/src/dali-unmanaged/tct-dali-unmanaged-core.h
+++ b/automated-tests/src/dali-unmanaged/tct-dali-unmanaged-core.h
@@ -238,6 +238,7 @@ extern int UtcDaliLongPressGestureDetectorTypeRegistry(void);
 extern int UtcDaliPanGestureDetectorTypeRegistry(void);
 extern int UtcDaliPinchGestureDetectorTypeRegistry(void);
 extern int UtcDaliTapGestureDetectorTypeRegistry(void);
+extern int UtcDaliTypeRegistryNamedType(void);
 extern int UtcDaliUtf8SequenceLength(void);
 extern int UtcDaliEmptyVectorInt(void);
 extern int UtcDaliVectorInt(void);
@@ -485,6 +486,7 @@ testcase tc_array[] = {
     {"UtcDaliPanGestureDetectorTypeRegistry", UtcDaliPanGestureDetectorTypeRegistry, utc_dali_unmanaged_startup, utc_dali_unmanaged_cleanup},
     {"UtcDaliPinchGestureDetectorTypeRegistry", UtcDaliPinchGestureDetectorTypeRegistry, utc_dali_unmanaged_startup, utc_dali_unmanaged_cleanup},
     {"UtcDaliTapGestureDetectorTypeRegistry", UtcDaliTapGestureDetectorTypeRegistry, utc_dali_unmanaged_startup, utc_dali_unmanaged_cleanup},
+    {"UtcDaliTypeRegistryNamedType", UtcDaliTypeRegistryNamedType, utc_dali_unmanaged_startup, utc_dali_unmanaged_cleanup},
     {"UtcDaliUtf8SequenceLength", UtcDaliUtf8SequenceLength, utc_dali_unmanaged_startup, utc_dali_unmanaged_cleanup},
     {"UtcDaliEmptyVectorInt", UtcDaliEmptyVectorInt, utc_dali_unmanaged_startup, utc_dali_unmanaged_cleanup},
     {"UtcDaliVectorInt", UtcDaliVectorInt, utc_dali_unmanaged_startup, utc_dali_unmanaged_cleanup},

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-ShaderEffect.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-ShaderEffect.cpp
index b0559ac..e1b13d7 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-ShaderEffect.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-ShaderEffect.cpp
@@ -38,15 +38,6 @@ static const char* FragmentSource =
 "  gl_FragColor = texture2D( sTexture, vTexCoord ) * uColor;\n"
 "}\n";
 
-static const char* FragmentSourceUsingExtensions =
-"void main()\n"
-"{\n"
-"  float floatValue = 0.5f;\n"
-"  float test = fwidth(floatValue);\n"
-"  gl_FragColor = texture2D( sTexture, vTexCoord ) * uColor;\n"
-"  gl_FragColor.a *= test;\n"
-"}\n";
-
 const int GETSOURCE_BUFFER_SIZE = 0x10000;
 
 static const char* TestImageFilename = "icon_wrt.png";