From c5a2326108b1571ab933cbb00cb35403c7c990c1 Mon Sep 17 00:00:00 2001 From: Victor Cebollada Date: Wed, 14 Jun 2017 16:49:39 +0100 Subject: [PATCH] Enable GLES 3.0 by default. Change-Id: I67230c3d07d1f2d7e8cab005ab9a5fcc0b327fcc Signed-off-by: Victor Cebollada --- adaptors/common/gl/egl-image-extensions.cpp | 2 -- adaptors/common/gl/gl-extensions.h | 1 - adaptors/tizen/gl/egl-image-extensions-tizen.cpp | 2 -- build/tizen/adaptor-uv/configure.ac | 2 +- build/tizen/adaptor/configure.ac | 2 +- packaging/dali-adaptor.spec | 4 ++-- 6 files changed, 4 insertions(+), 9 deletions(-) diff --git a/adaptors/common/gl/egl-image-extensions.cpp b/adaptors/common/gl/egl-image-extensions.cpp index 154a521..cc00800 100644 --- a/adaptors/common/gl/egl-image-extensions.cpp +++ b/adaptors/common/gl/egl-image-extensions.cpp @@ -22,8 +22,6 @@ // EXTERNAL INCLUDES #if DALI_GLES_VERSION >= 30 #include -#include - #else #include #endif // DALI_GLES_VERSION >= 30 diff --git a/adaptors/common/gl/gl-extensions.h b/adaptors/common/gl/gl-extensions.h index 569a266..2b2f6cc 100644 --- a/adaptors/common/gl/gl-extensions.h +++ b/adaptors/common/gl/gl-extensions.h @@ -22,7 +22,6 @@ #if DALI_GLES_VERSION >= 30 #include -#include #else #include #include diff --git a/adaptors/tizen/gl/egl-image-extensions-tizen.cpp b/adaptors/tizen/gl/egl-image-extensions-tizen.cpp index 57d0c08..24f5c82 100644 --- a/adaptors/tizen/gl/egl-image-extensions-tizen.cpp +++ b/adaptors/tizen/gl/egl-image-extensions-tizen.cpp @@ -22,8 +22,6 @@ // EXTERNAL INCLUDES #if DALI_GLES_VERSION >= 30 #include -#include - #else #include #endif // DALI_GLES_VERSION >= 30 diff --git a/build/tizen/adaptor-uv/configure.ac b/build/tizen/adaptor-uv/configure.ac index e61fccf..ee46712 100644 --- 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=20]) + [enable_gles=30]) 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 de27247..f7746dc 100644 --- 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=20]) + [enable_gles=30]) DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -DDALI_GLES_VERSION=${enable_gles}" diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec index 80b693b..3788707 100644 --- 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 2.0 if not specified. -%{!?target_gles_version: %define target_gles_version 20} +# Default to GLES 3.0 if not specified. +%{!?target_gles_version: %define target_gles_version 30} #--enable-efl=no \ # only affects dali-adaptor-uv #--enable-appfw=yes \ # affects both dali-adaptor & dali-adaptor-uv -- 2.7.4