Revert "Enable GLES 3.0 by default."

This reverts commit c5a2326108b1571ab933cbb00cb35403c7c990c1.

Change-Id: I681b95be2ffee149f1c7a3c480e5494cddf9da38

diff --git a/adaptors/common/gl/egl-image-extensions.cpp b/adaptors/common/gl/egl-image-extensions.cpp
index cc00800..154a521 100644 (file)
--- a/adaptors/common/gl/egl-image-extensions.cpp
+++ b/adaptors/common/gl/egl-image-extensions.cpp
@@ -22,6 +22,8 @@
 // EXTERNAL INCLUDES
 #if DALI_GLES_VERSION >= 30
 #include <GLES3/gl3.h>
+#include <GLES3/gl3ext.h>
+
 #else
 #include <GLES2/gl2.h>
 #endif // DALI_GLES_VERSION >= 30

diff --git a/adaptors/common/gl/gl-extensions.h b/adaptors/common/gl/gl-extensions.h
index 2b2f6cc..569a266 100644 (file)
--- a/adaptors/common/gl/gl-extensions.h
+++ b/adaptors/common/gl/gl-extensions.h
@@ -22,6 +22,7 @@
 
 #if DALI_GLES_VERSION >= 30
 #include <GLES3/gl3.h>
+#include <GLES3/gl3ext.h>
 #else
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>

diff --git a/adaptors/tizen/gl/egl-image-extensions-tizen.cpp b/adaptors/tizen/gl/egl-image-extensions-tizen.cpp
index 24f5c82..57d0c08 100644 (file)
--- a/adaptors/tizen/gl/egl-image-extensions-tizen.cpp
+++ b/adaptors/tizen/gl/egl-image-extensions-tizen.cpp
@@ -22,6 +22,8 @@
 // EXTERNAL INCLUDES
 #if DALI_GLES_VERSION >= 30
 #include <GLES3/gl3.h>
+#include <GLES3/gl3ext.h>
+
 #else
 #include <GLES2/gl2.h>
 #endif // DALI_GLES_VERSION >= 30

diff --git a/build/tizen/adaptor-uv/configure.ac b/build/tizen/adaptor-uv/configure.ac
index ee46712..e61fccf 100644 (file)
--- a/build/tizen/adaptor-uv/configure.ac
+++ b/build/tizen/adaptor-uv/configure.ac
@@ -142,7 +142,7 @@ AC_ARG_ENABLE([gles],
               [AC_HELP_STRING([--enable-gles],
                               [Specify the OpenGL ES version for backwards compatibility])],
               [enable_gles=$enableval],
-              [enable_gles=30])
+              [enable_gles=20])
 
 DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -DDALI_GLES_VERSION=${enable_gles}"
 

diff --git a/build/tizen/adaptor/configure.ac b/build/tizen/adaptor/configure.ac
index f7746dc..de27247 100644 (file)
--- a/build/tizen/adaptor/configure.ac
+++ b/build/tizen/adaptor/configure.ac
@@ -131,7 +131,7 @@ AC_ARG_ENABLE([gles],
               [AC_HELP_STRING([--enable-gles],
                               [Specify the OpenGL ES version for backwards compatibility])],
               [enable_gles=$enableval],
-              [enable_gles=30])
+              [enable_gles=20])
 
 DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -DDALI_GLES_VERSION=${enable_gles}"
 

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index 3788707..80b693b 100644 (file)
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -288,8 +288,8 @@ FONT_CONFIGURATION_FILE="%{font_configuration_file}" ; export FONT_CONFIGURATION
 TIZEN_PLATFORM_CONFIG_SUPPORTED="%{tizen_platform_config_supported}" ; export TIZEN_PLATFORM_CONFIG_SUPPORTED
 %endif
 
-# Default to GLES 3.0 if not specified.
-%{!?target_gles_version: %define target_gles_version 30}
+# Default to GLES 2.0 if not specified.
+%{!?target_gles_version: %define target_gles_version 20}
 
 #--enable-efl=no \ # only affects dali-adaptor-uv
 #--enable-appfw=yes \ # affects both dali-adaptor & dali-adaptor-uv