Revert "[Tizen] Add codes for Dali Windows Backend"

[platform/core/uifw/dali-core.git] / dali / internal / render / shaders / program.cpp

diff --git a/dali/internal/render/shaders/program.cpp b/dali/internal/render/shaders/program.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 530b629..451de0b
--- a/dali/internal/render/shaders/program.cpp
+++ b/dali/internal/render/shaders/program.cpp
@@ -248,7 +248,7 @@ void Program::GetActiveSamplerUniforms()
   mGlAbstraction.GetProgramiv( mProgramId, GL_ACTIVE_UNIFORM_MAX_LENGTH, &uniformMaxNameLength );
 
   std::vector<std::string> samplerNames;
-  std::vector<char> name(uniformMaxNameLength + 1); // Allow for null terminator
+  char name[uniformMaxNameLength+1]; // Allow for null terminator
   std::vector< LocationPosition >  samplerUniformLocations;
 
   {
@@ -259,12 +259,12 @@ void Program::GetActiveSamplerUniforms()
     for( int i=0; i<numberOfActiveUniforms; ++i )
     {
       mGlAbstraction.GetActiveUniform( mProgramId, static_cast< GLuint >( i ), uniformMaxNameLength,
-                                       &nameLength, &number, &type, name.data() );
+                                       &nameLength, &number, &type, name );
 
       if( type == GL_SAMPLER_2D || type == GL_SAMPLER_CUBE || type == GL_SAMPLER_EXTERNAL_OES )
       {
-        GLuint location = mGlAbstraction.GetUniformLocation( mProgramId, name.data() );
-        samplerNames.push_back( name.data() );
+        GLuint location = mGlAbstraction.GetUniformLocation( mProgramId, name );
+        samplerNames.push_back(name);
         samplerUniformLocations.push_back(LocationPosition(location, -1));
       }
     }