Revert "[3.0] Enable GLES 3.0 by default."

This reverts commit 6cf2d49b47c78116e46558aa0b6a83617986a8bd.

Change-Id: I1c6e9f3894995cdb2308f4a4d94bded134aba6e0

diff --git a/adaptors/common/gl/egl-image-extensions.cpp b/adaptors/common/gl/egl-image-extensions.cpp
index 14ae6e2..b77bfa1 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 5edef30..ad1edb6 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 5b97a3a..9dfe67b 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 8ee2fc0..f0ff169 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 ca198d4..a73aff2 100644 (file)
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -284,8 +284,8 @@ FONT_DOWNLOADED_PATH="%{font_downloaded_path}" ; export FONT_DOWNLOADED_PATH
 FONT_APPLICATION_PATH="%{font_application_path}"  ; export FONT_APPLICATION_PATH
 FONT_CONFIGURATION_FILE="%{font_configuration_file}" ; export FONT_CONFIGURATION_FILE
 
-# 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