Merge "Clean up the code to build successfully on macOS" into devel/master

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

diff --git a/dali/internal/render/shaders/program-controller.cpp b/dali/internal/render/shaders/program-controller.cpp
index 87c268e..1452564 100644 (file)
--- a/dali/internal/render/shaders/program-controller.cpp
+++ b/dali/internal/render/shaders/program-controller.cpp
@@ -31,9 +31,9 @@ namespace Internal
 {
 
 ProgramController::ProgramController( Integration::GlAbstraction& glAbstraction )
-: mShaderSaver( 0 ),
+: mShaderSaver( nullptr ),
   mGlAbstraction( glAbstraction ),
-  mCurrentProgram( NULL ),
+  mCurrentProgram( nullptr ),
   mProgramBinaryFormat( 0 ),
   mNumberOfProgramBinaryFormats( 0 )
 {
@@ -41,9 +41,7 @@ ProgramController::ProgramController( Integration::GlAbstraction& glAbstraction
   mProgramCache.Reserve( 32 );
 }
 
-ProgramController::~ProgramController()
-{
-}
+ProgramController::~ProgramController() = default;
 
 void ProgramController::ResetProgramMatrices()
 {
@@ -51,8 +49,8 @@ void ProgramController::ResetProgramMatrices()
   for ( ProgramIterator iter = mProgramCache.Begin(); iter != end; ++iter )
   {
     Program* program = (*iter)->GetProgram();
-    program->SetProjectionMatrix( NULL );
-    program->SetViewMatrix( NULL );
+    program->SetProjectionMatrix( nullptr );
+    program->SetViewMatrix( nullptr );
   }
 }
 
@@ -82,7 +80,7 @@ void ProgramController::GlContextDestroyed()
   mNumberOfProgramBinaryFormats = 0;
   mProgramBinaryFormat = 0;
 
-  SetCurrentProgram( NULL );
+  SetCurrentProgram( nullptr );
   // Inform programs they are no longer valid
   const ProgramIterator end = mProgramCache.End();
   for ( ProgramIterator iter = mProgramCache.Begin(); iter != end; ++iter )
@@ -98,7 +96,7 @@ Integration::GlAbstraction& ProgramController::GetGlAbstraction()
 
 Program* ProgramController::GetProgram( size_t shaderHash )
 {
-  Program* program = NULL;
+  Program* program = nullptr;
   const ProgramIterator end = mProgramCache.End();
   for ( ProgramIterator iter = mProgramCache.Begin(); iter != end; ++iter )
   {
@@ -144,7 +142,7 @@ void ProgramController::StoreBinary( Internal::ShaderDataPtr programData )
   DALI_ASSERT_DEBUG( programData->GetBufferSize() > 0 );
   DALI_ASSERT_DEBUG( mShaderSaver && "SetShaderSaver() should have been called during startup." );
 
-  if( mShaderSaver != NULL )
+  if( mShaderSaver != nullptr )
   {
     mShaderSaver->SaveBinary( programData );
   }