Support EGL_DONT_CARE for multi-sampling level

Change-Id: I10e47e48c94000a9cd3807453b37db8f086ce3de

diff --git a/adaptors/base/environment-options.cpp b/adaptors/base/environment-options.cpp
index c96edeb..5310615 100644 (file)
--- a/adaptors/base/environment-options.cpp
+++ b/adaptors/base/environment-options.cpp
@@ -38,6 +38,7 @@ namespace Adaptor
 namespace
 {
 const unsigned int DEFAULT_STATISTICS_LOG_FREQUENCY = 2;
+const int DEFAULT_MULTI_SAMPLING_LEVEL = 4;
 
 unsigned int GetIntegerEnvironmentVariable( const char* variable, unsigned int defaultValue )
 {
@@ -107,7 +108,7 @@ EnvironmentOptions::EnvironmentOptions()
   mThreadingMode( ThreadingMode::COMBINED_UPDATE_RENDER ),
   mRenderRefreshRate( 1 ),
   mGlesCallAccumulate( false ),
-  mMultiSamplingLevel( 0 ),
+  mMultiSamplingLevel( DEFAULT_MULTI_SAMPLING_LEVEL ),
   mMaxTextureSize( 0 ),
   mIndicatorVisibleMode( -1 ),
   mLogFunction( NULL )
@@ -256,7 +257,7 @@ unsigned int EnvironmentOptions::GetRenderRefreshRate() const
   return mRenderRefreshRate;
 }
 
-unsigned int EnvironmentOptions::GetMultiSamplingLevel() const
+int EnvironmentOptions::GetMultiSamplingLevel() const
 {
   return mMultiSamplingLevel;
 }
@@ -416,10 +417,7 @@ void EnvironmentOptions::ParseEnvironmentOptions()
   int multiSamplingLevel( 0 );
   if( GetIntegerEnvironmentVariable( DALI_ENV_MULTI_SAMPLING_LEVEL, multiSamplingLevel ) )
   {
-    if( multiSamplingLevel > 0 )
-    {
-      mMultiSamplingLevel = multiSamplingLevel;
-    }
+    mMultiSamplingLevel = multiSamplingLevel;
   }
 
   int maxTextureSize( 0 );

diff --git a/adaptors/base/environment-options.h b/adaptors/base/environment-options.h
index 42022fd..2d2300d 100644 (file)
--- a/adaptors/base/environment-options.h
+++ b/adaptors/base/environment-options.h
@@ -38,7 +38,6 @@ namespace Adaptor
  */
 class EnvironmentOptions
 {
-
 public:
 
   /**
@@ -206,7 +205,7 @@ public:
   /**
    * @return The number of samples required in multisample buffers
    */
-  unsigned int GetMultiSamplingLevel() const;
+  int GetMultiSamplingLevel() const;
 
   /**
    * @return The maximum texture size
@@ -253,7 +252,7 @@ private: // Data
   ThreadingMode::Type mThreadingMode;             ///< threading mode
   unsigned int mRenderRefreshRate;                ///< render refresh rate
   bool mGlesCallAccumulate;                       ///< Whether or not to accumulate gles call statistics
-  unsigned int mMultiSamplingLevel;               ///< The number of samples required in multisample buffers
+  int mMultiSamplingLevel;                        ///< The number of samples required in multisample buffers
   unsigned int mMaxTextureSize;                   ///< The maximum texture size that GL can handle
   int mIndicatorVisibleMode;                      ///< Indicator visible mode
 

diff --git a/adaptors/common/gl/egl-factory.cpp b/adaptors/common/gl/egl-factory.cpp
index f9cf846..b30621d 100644 (file)
--- a/adaptors/common/gl/egl-factory.cpp
+++ b/adaptors/common/gl/egl-factory.cpp
@@ -30,16 +30,12 @@ namespace Internal
 namespace Adaptor
 {
 
-EglFactory::EglFactory( unsigned int multiSamplingLevel )
+EglFactory::EglFactory( int multiSamplingLevel )
 : mEglImplementation(NULL),
   mEglImageExtensions(NULL),
   mEglSync(new EglSyncImplementation), // Created early, as needed by Core constructor
-  mMultiSamplingLevel( 4 )
+  mMultiSamplingLevel( multiSamplingLevel )
 {
-  if( multiSamplingLevel > 0 )
-  {
-    mMultiSamplingLevel = multiSamplingLevel;
-  }
 }
 
 EglFactory::~EglFactory()

diff --git a/adaptors/common/gl/egl-factory.h b/adaptors/common/gl/egl-factory.h
index 5b449a1..872f39f 100644 (file)
--- a/adaptors/common/gl/egl-factory.h
+++ b/adaptors/common/gl/egl-factory.h
@@ -39,7 +39,7 @@ public:
   /**
    * Constructor
    */
-  EglFactory( unsigned int multiSamplingLevel );
+  EglFactory( int multiSamplingLevel );
 
   /**
    * Destructor
@@ -84,7 +84,7 @@ private:
   EglImageExtensions* mEglImageExtensions;
   EglSyncImplementation* mEglSync;
 
-  unsigned int mMultiSamplingLevel;
+  int mMultiSamplingLevel;
 };
 
 }

diff --git a/adaptors/common/gl/egl-implementation.cpp b/adaptors/common/gl/egl-implementation.cpp
index b55470b..7ca4366 100644 (file)
--- a/adaptors/common/gl/egl-implementation.cpp
+++ b/adaptors/common/gl/egl-implementation.cpp
@@ -52,7 +52,7 @@ namespace Adaptor
   } \
 }
 
-EglImplementation::EglImplementation( unsigned int multiSamplingLevel )
+EglImplementation::EglImplementation( int multiSamplingLevel )
   : mEglNativeDisplay(0),
     mEglNativeWindow(0),
     mCurrentEglNativePixmap(0),
@@ -334,10 +334,13 @@ void EglImplementation::ChooseConfig( bool isWindowType, ColorDepth depth )
   configAttribs.PushBack( EGL_STENCIL_SIZE );
   configAttribs.PushBack( 8 );
 #ifndef DALI_PROFILE_UBUNTU
-  configAttribs.PushBack( EGL_SAMPLES );
-  configAttribs.PushBack( mMultiSamplingLevel );
-  configAttribs.PushBack( EGL_SAMPLE_BUFFERS );
-  configAttribs.PushBack( 1 );
+  if( mMultiSamplingLevel != EGL_DONT_CARE )
+  {
+    configAttribs.PushBack( EGL_SAMPLES );
+    configAttribs.PushBack( mMultiSamplingLevel );
+    configAttribs.PushBack( EGL_SAMPLE_BUFFERS );
+    configAttribs.PushBack( 1 );
+  }
 #endif // DALI_PROFILE_UBUNTU
   configAttribs.PushBack( EGL_NONE );
 

diff --git a/adaptors/common/gl/egl-implementation.h b/adaptors/common/gl/egl-implementation.h
index 003af2b..4081ed3 100644 (file)
--- a/adaptors/common/gl/egl-implementation.h
+++ b/adaptors/common/gl/egl-implementation.h
@@ -44,7 +44,7 @@ public:
    * Constructor
    * @param environmentOptions To check the envirionment options
    */
-  EglImplementation( unsigned int multiSamplingLevel );
+  EglImplementation( int multiSamplingLevel );
 
   /**
    * Destructor
@@ -195,7 +195,7 @@ private:
   bool                 mIsWindow;
   ColorDepth           mColorDepth;
 
-  unsigned int         mMultiSamplingLevel;
+  int                  mMultiSamplingLevel;
 };
 
 } // namespace Adaptor