From: Seungho, Baek <sbsh.baek@samsung.com>
Date: Wed, 4 Apr 2018 11:45:32 +0000 (+0900)
Subject: Fix to use OpenGL es 3.0
X-Git-Tag: dali_1.3.49~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F48%2F174848%2F6;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

Fix to use OpenGL es 3.0

 - Remove header <GLES3/gl3ext.h>
 - Change folder name dali/internal/graphics/gles20 -> dali/internal/graphics/gles

Change-Id: I6edb398dac48720b9f5ea077832b5c6eae20b98f
Signed-off-by: Seungho, Baek <sbsh.baek@samsung.com>
---

diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am
index 7e472e0..82c8783 100644
--- a/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@ -42,7 +42,7 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(devel_api_src_files) \
                   $(adaptor_devel_api_text_abstraction_src_files) \
                   $(adaptor_graphics_common_src_files) \
-                  $(adaptor_graphics_gles20_src_files) \
+                  $(adaptor_graphics_gles_src_files) \
                   $(adaptor_graphics_ubuntu_src_files) \
                   $(adaptor_haptics_common_src_files) \
                   $(adaptor_imaging_common_src_files) \
@@ -96,7 +96,7 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(devel_api_src_files) \
                   $(adaptor_devel_api_text_abstraction_src_files) \
                   $(adaptor_graphics_common_src_files) \
-                  $(adaptor_graphics_gles20_src_files) \
+                  $(adaptor_graphics_gles_src_files) \
                   $(adaptor_graphics_tizen_src_files) \
                   $(adaptor_haptics_common_src_files) \
                   $(adaptor_imaging_common_src_files) \
@@ -158,7 +158,7 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(devel_api_src_files) \
                   $(adaptor_devel_api_text_abstraction_src_files) \
                   $(adaptor_graphics_common_src_files) \
-                  $(adaptor_graphics_gles20_src_files) \
+                  $(adaptor_graphics_gles_src_files) \
                   $(adaptor_graphics_tizen_src_files) \
                   $(adaptor_haptics_common_src_files) \
                   $(adaptor_haptics_tizen_src_files) \
@@ -221,7 +221,7 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(devel_api_src_files) \
                   $(adaptor_devel_api_text_abstraction_src_files) \
                   $(adaptor_graphics_common_src_files) \
-                  $(adaptor_graphics_gles20_src_files) \
+                  $(adaptor_graphics_gles_src_files) \
                   $(adaptor_graphics_tizen_src_files) \
                   $(adaptor_haptics_common_src_files) \
                   $(adaptor_imaging_common_src_files) \
@@ -282,7 +282,7 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(devel_api_src_files) \
                   $(adaptor_devel_api_text_abstraction_src_files) \
                   $(adaptor_graphics_common_src_files) \
-                  $(adaptor_graphics_gles20_src_files) \
+                  $(adaptor_graphics_gles_src_files) \
                   $(adaptor_graphics_tizen_src_files) \
                   $(adaptor_haptics_common_src_files) \
                   $(adaptor_imaging_common_src_files) \
@@ -346,7 +346,7 @@ LIBDALI_ADAPTOR_LA_SOURCES = \
                   $(devel_api_src_files) \
                   $(adaptor_devel_api_text_abstraction_src_files) \
                   $(adaptor_graphics_common_src_files) \
-                  $(adaptor_graphics_gles20_src_files) \
+                  $(adaptor_graphics_gles_src_files) \
                   $(adaptor_graphics_tizen_src_files) \
                   $(adaptor_haptics_common_src_files) \
                   $(adaptor_imaging_common_src_files) \
diff --git a/dali/internal/adaptor/common/adaptor-builder-impl.cpp b/dali/internal/adaptor/common/adaptor-builder-impl.cpp
index 8ea291e..37332b1 100644
--- a/dali/internal/adaptor/common/adaptor-builder-impl.cpp
+++ b/dali/internal/adaptor/common/adaptor-builder-impl.cpp
@@ -20,7 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/dali-adaptor-common.h>
-#include <dali/internal/graphics/gles20/egl-graphics-factory.h>
+#include <dali/internal/graphics/gles/egl-graphics-factory.h>
 #include <dali/internal/window-system/common/display-utils.h>
 
 
diff --git a/dali/internal/adaptor/common/adaptor-builder-impl.h b/dali/internal/adaptor/common/adaptor-builder-impl.h
index b382b4b..ab09a34 100644
--- a/dali/internal/adaptor/common/adaptor-builder-impl.h
+++ b/dali/internal/adaptor/common/adaptor-builder-impl.h
@@ -21,7 +21,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/internal/system/common/environment-options.h>
-#include <dali/internal/graphics/gles20/egl-graphics-factory.h>
+#include <dali/internal/graphics/gles/egl-graphics-factory.h>
 
 
 namespace Dali
diff --git a/dali/internal/adaptor/common/adaptor-impl.cpp b/dali/internal/adaptor/common/adaptor-impl.cpp
index 33dce23..ee1b447 100755
--- a/dali/internal/adaptor/common/adaptor-impl.cpp
+++ b/dali/internal/adaptor/common/adaptor-impl.cpp
@@ -37,8 +37,8 @@
 #include <dali/internal/system/common/performance-interface-factory.h>
 #include <dali/internal/adaptor/common/lifecycle-observer.h>
 
-#include <dali/internal/graphics/gles20/egl-graphics-factory.h>
-#include <dali/internal/graphics/gles20/egl-graphics.h> // Temporary until Core is abstracted
+#include <dali/internal/graphics/gles/egl-graphics-factory.h>
+#include <dali/internal/graphics/gles/egl-graphics.h> // Temporary until Core is abstracted
 
 #include <dali/devel-api/text-abstraction/font-client.h>
 
@@ -47,9 +47,9 @@
 #include <dali/internal/accessibility/common/accessibility-adaptor-impl.h>
 #include <dali/internal/input/common/gesture-manager.h>
 #include <dali/internal/window-system/common/event-handler.h>
-#include <dali/internal/graphics/gles20/gl-proxy-implementation.h>
-#include <dali/internal/graphics/gles20/gl-implementation.h>
-#include <dali/internal/graphics/gles20/egl-sync-implementation.h>
+#include <dali/internal/graphics/gles/gl-proxy-implementation.h>
+#include <dali/internal/graphics/gles/gl-implementation.h>
+#include <dali/internal/graphics/gles/egl-sync-implementation.h>
 #include <dali/internal/graphics/common/egl-image-extensions.h>
 #include <dali/internal/clipboard/common/clipboard-impl.h>
 #include <dali/internal/graphics/common/vsync-monitor.h>
diff --git a/dali/internal/adaptor/common/adaptor-internal-services.h b/dali/internal/adaptor/common/adaptor-internal-services.h
index 0cc2d32..4823a6b 100644
--- a/dali/internal/adaptor/common/adaptor-internal-services.h
+++ b/dali/internal/adaptor/common/adaptor-internal-services.h
@@ -27,7 +27,7 @@
 #include <dali/integration-api/trigger-event-factory-interface.h>
 #include <dali/internal/window-system/common/display-connection.h>
 #include <dali/internal/graphics/common/graphics-interface.h>
-#include <dali/internal/graphics/gles20/egl-factory-interface.h>
+#include <dali/internal/graphics/gles/egl-factory-interface.h>
 #include <dali/internal/network/common/socket-factory-interface.h>
 #include <dali/internal/system/common/performance-interface.h>
 #include <dali/internal/graphics/common/vsync-monitor-interface.h>
diff --git a/dali/internal/graphics/file.list b/dali/internal/graphics/file.list
index 1949b28..016a3d8 100644
--- a/dali/internal/graphics/file.list
+++ b/dali/internal/graphics/file.list
@@ -1,14 +1,14 @@
 
 
-# module: graphics, backend: gles20
-adaptor_graphics_gles20_src_files=\
-    ${adaptor_graphics_dir}/gles20/egl-debug.cpp \
-    ${adaptor_graphics_dir}/gles20/egl-implementation.cpp \
-    ${adaptor_graphics_dir}/gles20/egl-sync-implementation.cpp \
-    ${adaptor_graphics_dir}/gles20/gl-extensions.cpp \
-    ${adaptor_graphics_dir}/gles20/gl-proxy-implementation.cpp \
-    ${adaptor_graphics_dir}/gles20/egl-graphics-factory.cpp \
-    ${adaptor_graphics_dir}/gles20/egl-graphics.cpp
+# module: graphics, backend: gles
+adaptor_graphics_gles_src_files=\
+    ${adaptor_graphics_dir}/gles/egl-debug.cpp \
+    ${adaptor_graphics_dir}/gles/egl-implementation.cpp \
+    ${adaptor_graphics_dir}/gles/egl-sync-implementation.cpp \
+    ${adaptor_graphics_dir}/gles/gl-extensions.cpp \
+    ${adaptor_graphics_dir}/gles/gl-proxy-implementation.cpp \
+    ${adaptor_graphics_dir}/gles/egl-graphics-factory.cpp \
+    ${adaptor_graphics_dir}/gles/egl-graphics.cpp
 
 # module: graphics, backend: tizen
 adaptor_graphics_tizen_src_files=\
diff --git a/dali/internal/graphics/gles20/egl-debug.cpp b/dali/internal/graphics/gles/egl-debug.cpp
similarity index 98%
rename from dali/internal/graphics/gles20/egl-debug.cpp
rename to dali/internal/graphics/gles/egl-debug.cpp
index bf0f95a..1f5bbfa 100644
--- a/dali/internal/graphics/gles20/egl-debug.cpp
+++ b/dali/internal/graphics/gles/egl-debug.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/graphics/gles20/egl-debug.h>
+#include <dali/internal/graphics/gles/egl-debug.h>
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
diff --git a/dali/internal/graphics/gles20/egl-debug.h b/dali/internal/graphics/gles/egl-debug.h
similarity index 100%
rename from dali/internal/graphics/gles20/egl-debug.h
rename to dali/internal/graphics/gles/egl-debug.h
diff --git a/dali/internal/graphics/gles20/egl-factory-interface.h b/dali/internal/graphics/gles/egl-factory-interface.h
similarity index 100%
rename from dali/internal/graphics/gles20/egl-factory-interface.h
rename to dali/internal/graphics/gles/egl-factory-interface.h
diff --git a/dali/internal/graphics/gles20/egl-graphics-factory.cpp b/dali/internal/graphics/gles/egl-graphics-factory.cpp
similarity index 90%
rename from dali/internal/graphics/gles20/egl-graphics-factory.cpp
rename to dali/internal/graphics/gles/egl-graphics-factory.cpp
index 80e6693..5588bc6 100644
--- a/dali/internal/graphics/gles20/egl-graphics-factory.cpp
+++ b/dali/internal/graphics/gles/egl-graphics-factory.cpp
@@ -17,8 +17,8 @@
 
 
 // CLASS HEADER
-#include <dali/internal/graphics/gles20/egl-graphics-factory.h>
-#include <dali/internal/graphics/gles20/egl-graphics.h>
+#include <dali/internal/graphics/gles/egl-graphics-factory.h>
+#include <dali/internal/graphics/gles/egl-graphics.h>
 
 // INTERNAL INCLUDES
 
diff --git a/dali/internal/graphics/gles20/egl-graphics-factory.h b/dali/internal/graphics/gles/egl-graphics-factory.h
similarity index 100%
rename from dali/internal/graphics/gles20/egl-graphics-factory.h
rename to dali/internal/graphics/gles/egl-graphics-factory.h
diff --git a/dali/internal/graphics/gles20/egl-graphics.cpp b/dali/internal/graphics/gles/egl-graphics.cpp
similarity index 98%
rename from dali/internal/graphics/gles20/egl-graphics.cpp
rename to dali/internal/graphics/gles/egl-graphics.cpp
index 3df7198..de42dea 100644
--- a/dali/internal/graphics/gles20/egl-graphics.cpp
+++ b/dali/internal/graphics/gles/egl-graphics.cpp
@@ -17,7 +17,7 @@
 
 
 // CLASS HEADER
-#include <dali/internal/graphics/gles20/egl-graphics.h>
+#include <dali/internal/graphics/gles/egl-graphics.h>
 
 // INTERNAL INCLUDES
 #include <dali/internal/window-system/common/display-utils.h> // For Utils::MakeUnique
diff --git a/dali/internal/graphics/gles20/egl-graphics.h b/dali/internal/graphics/gles/egl-graphics.h
similarity index 93%
rename from dali/internal/graphics/gles20/egl-graphics.h
rename to dali/internal/graphics/gles/egl-graphics.h
index 603b584..36a4c3c 100644
--- a/dali/internal/graphics/gles20/egl-graphics.h
+++ b/dali/internal/graphics/gles/egl-graphics.h
@@ -22,13 +22,13 @@
 
 // INTERNAL INCLUDES
 #include <dali/internal/graphics/common/graphics-interface.h>
-#include <dali/internal/graphics/gles20/gl-proxy-implementation.h>
-#include <dali/internal/graphics/gles20/gl-implementation.h>
+#include <dali/internal/graphics/gles/gl-proxy-implementation.h>
+#include <dali/internal/graphics/gles/gl-implementation.h>
 #include <dali/integration-api/egl-interface.h>
 
-#include <dali/internal/graphics/gles20/egl-implementation.h>
+#include <dali/internal/graphics/gles/egl-implementation.h>
 #include <dali/internal/graphics/common/egl-image-extensions.h>
-#include <dali/internal/graphics/gles20/egl-sync-implementation.h>
+#include <dali/internal/graphics/gles/egl-sync-implementation.h>
 
 
 namespace Dali
diff --git a/dali/internal/graphics/gles20/egl-implementation.cpp b/dali/internal/graphics/gles/egl-implementation.cpp
similarity index 98%
rename from dali/internal/graphics/gles20/egl-implementation.cpp
rename to dali/internal/graphics/gles/egl-implementation.cpp
index 647087b..783c06a 100755
--- a/dali/internal/graphics/gles20/egl-implementation.cpp
+++ b/dali/internal/graphics/gles/egl-implementation.cpp
@@ -17,7 +17,7 @@
 
 
 // CLASS HEADER
-#include <dali/internal/graphics/gles20/egl-implementation.h>
+#include <dali/internal/graphics/gles/egl-implementation.h>
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
@@ -26,8 +26,8 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/dali-adaptor-common.h>
-#include <dali/internal/graphics/gles20/gl-implementation.h>
-#include <dali/internal/graphics/gles20/egl-debug.h>
+#include <dali/internal/graphics/gles/gl-implementation.h>
+#include <dali/internal/graphics/gles/egl-debug.h>
 
 // EGL constants use C style casts
 #pragma GCC diagnostic push
diff --git a/dali/internal/graphics/gles20/egl-implementation.h b/dali/internal/graphics/gles/egl-implementation.h
similarity index 100%
rename from dali/internal/graphics/gles20/egl-implementation.h
rename to dali/internal/graphics/gles/egl-implementation.h
diff --git a/dali/internal/graphics/gles20/egl-sync-implementation.cpp b/dali/internal/graphics/gles/egl-sync-implementation.cpp
similarity index 97%
rename from dali/internal/graphics/gles20/egl-sync-implementation.cpp
rename to dali/internal/graphics/gles/egl-sync-implementation.cpp
index becc7a1..a941f02 100644
--- a/dali/internal/graphics/gles20/egl-sync-implementation.cpp
+++ b/dali/internal/graphics/gles/egl-sync-implementation.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/graphics/gles20/egl-sync-implementation.h>
+#include <dali/internal/graphics/gles/egl-sync-implementation.h>
 
 // EXTERNAL INCLUDES
 
@@ -31,7 +31,7 @@
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/graphics/gles20/egl-implementation.h>
+#include <dali/internal/graphics/gles/egl-implementation.h>
 
 #ifdef _ARCH_ARM_
 
diff --git a/dali/internal/graphics/gles20/egl-sync-implementation.h b/dali/internal/graphics/gles/egl-sync-implementation.h
similarity index 100%
rename from dali/internal/graphics/gles20/egl-sync-implementation.h
rename to dali/internal/graphics/gles/egl-sync-implementation.h
diff --git a/dali/internal/graphics/gles20/gl-extensions.cpp b/dali/internal/graphics/gles/gl-extensions.cpp
similarity index 98%
rename from dali/internal/graphics/gles20/gl-extensions.cpp
rename to dali/internal/graphics/gles/gl-extensions.cpp
index fea1eac..3cc449a 100644
--- a/dali/internal/graphics/gles20/gl-extensions.cpp
+++ b/dali/internal/graphics/gles/gl-extensions.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/graphics/gles20/gl-extensions.h>
+#include <dali/internal/graphics/gles/gl-extensions.h>
 
 // EXTERNAL INCLUDES
 #include <EGL/egl.h>
diff --git a/dali/internal/graphics/gles20/gl-extensions.h b/dali/internal/graphics/gles/gl-extensions.h
similarity index 99%
rename from dali/internal/graphics/gles20/gl-extensions.h
rename to dali/internal/graphics/gles/gl-extensions.h
index 569a266..2b2f6cc 100644
--- a/dali/internal/graphics/gles20/gl-extensions.h
+++ b/dali/internal/graphics/gles/gl-extensions.h
@@ -22,7 +22,6 @@
 
 #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/dali/internal/graphics/gles20/gl-implementation.h b/dali/internal/graphics/gles/gl-implementation.h
similarity index 99%
rename from dali/internal/graphics/gles20/gl-implementation.h
rename to dali/internal/graphics/gles/gl-implementation.h
index 60a7b00..b1ce82d 100644
--- a/dali/internal/graphics/gles20/gl-implementation.h
+++ b/dali/internal/graphics/gles/gl-implementation.h
@@ -35,7 +35,7 @@
 #include <dali/integration-api/gl-abstraction.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/graphics/gles20/gl-extensions.h>
+#include <dali/internal/graphics/gles/gl-extensions.h>
 
 namespace Dali
 {
diff --git a/dali/internal/graphics/gles20/gl-proxy-implementation.cpp b/dali/internal/graphics/gles/gl-proxy-implementation.cpp
similarity index 99%
rename from dali/internal/graphics/gles20/gl-proxy-implementation.cpp
rename to dali/internal/graphics/gles/gl-proxy-implementation.cpp
index b5724b4..ae87def 100644
--- a/dali/internal/graphics/gles20/gl-proxy-implementation.cpp
+++ b/dali/internal/graphics/gles/gl-proxy-implementation.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/graphics/gles20/gl-proxy-implementation.h>
+#include <dali/internal/graphics/gles/gl-proxy-implementation.h>
 
 // EXTERNAL INCLUDES
 #include <math.h>
diff --git a/dali/internal/graphics/gles20/gl-proxy-implementation.h b/dali/internal/graphics/gles/gl-proxy-implementation.h
similarity index 99%
rename from dali/internal/graphics/gles20/gl-proxy-implementation.h
rename to dali/internal/graphics/gles/gl-proxy-implementation.h
index 26c24ca..35bd511 100644
--- a/dali/internal/graphics/gles20/gl-proxy-implementation.h
+++ b/dali/internal/graphics/gles/gl-proxy-implementation.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/internal/graphics/gles20/gl-implementation.h>
+#include <dali/internal/graphics/gles/gl-implementation.h>
 
 namespace Dali
 {
diff --git a/dali/internal/graphics/tizen/egl-image-extensions-tizen.cpp b/dali/internal/graphics/tizen/egl-image-extensions-tizen.cpp
index 781c32f..a0d4d79 100644
--- a/dali/internal/graphics/tizen/egl-image-extensions-tizen.cpp
+++ b/dali/internal/graphics/tizen/egl-image-extensions-tizen.cpp
@@ -22,7 +22,6 @@
 // EXTERNAL INCLUDES
 #if DALI_GLES_VERSION >= 30
 #include <GLES3/gl3.h>
-#include <GLES3/gl3ext.h>
 
 #else
 #include <GLES2/gl2.h>
@@ -35,7 +34,7 @@
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/graphics/gles20/egl-implementation.h>
+#include <dali/internal/graphics/gles/egl-implementation.h>
 
 // TBM surface support
 #ifndef EGL_NATIVE_SURFACE_TIZEN
diff --git a/dali/internal/graphics/ubuntu/egl-image-extensions-ubuntu.cpp b/dali/internal/graphics/ubuntu/egl-image-extensions-ubuntu.cpp
index 800d34b..526b3dd 100644
--- a/dali/internal/graphics/ubuntu/egl-image-extensions-ubuntu.cpp
+++ b/dali/internal/graphics/ubuntu/egl-image-extensions-ubuntu.cpp
@@ -22,7 +22,6 @@
 // EXTERNAL INCLUDES
 #if DALI_GLES_VERSION >= 30
 #include <GLES3/gl3.h>
-#include <GLES3/gl3ext.h>
 
 #else
 #include <GLES2/gl2.h>
@@ -35,7 +34,7 @@
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/graphics/gles20/egl-implementation.h>
+#include <dali/internal/graphics/gles/egl-implementation.h>
 
 
 namespace
diff --git a/dali/internal/imaging/common/native-bitmap-buffer-impl.cpp b/dali/internal/imaging/common/native-bitmap-buffer-impl.cpp
index 7bd4570..1741803 100644
--- a/dali/internal/imaging/common/native-bitmap-buffer-impl.cpp
+++ b/dali/internal/imaging/common/native-bitmap-buffer-impl.cpp
@@ -23,8 +23,8 @@
 #include <dali/integration-api/bitmap.h>
 
 // INTERNAL HEADERS
-#include <dali/internal/graphics/gles20/gl-implementation.h>
-#include <dali/internal/graphics/gles20/egl-graphics.h>
+#include <dali/internal/graphics/gles/gl-implementation.h>
+#include <dali/internal/graphics/gles/egl-graphics.h>
 
 namespace Dali
 {
diff --git a/dali/internal/imaging/tizen/native-image-source-impl-tizen.cpp b/dali/internal/imaging/tizen/native-image-source-impl-tizen.cpp
index e4bcc00..401a33a 100644
--- a/dali/internal/imaging/tizen/native-image-source-impl-tizen.cpp
+++ b/dali/internal/imaging/tizen/native-image-source-impl-tizen.cpp
@@ -26,7 +26,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/internal/graphics/common/egl-image-extensions.h>
-#include <dali/internal/graphics/gles20/egl-graphics.h>
+#include <dali/internal/graphics/gles/egl-graphics.h>
 #include <dali/internal/adaptor/common/adaptor-impl.h>
 #include <dali/integration-api/render-surface.h>
 
diff --git a/dali/internal/imaging/tizen/native-image-source-queue-impl-tizen.cpp b/dali/internal/imaging/tizen/native-image-source-queue-impl-tizen.cpp
index 8223c81..b72f743 100644
--- a/dali/internal/imaging/tizen/native-image-source-queue-impl-tizen.cpp
+++ b/dali/internal/imaging/tizen/native-image-source-queue-impl-tizen.cpp
@@ -25,7 +25,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/internal/graphics/common/egl-image-extensions.h>
-#include <dali/internal/graphics/gles20/egl-graphics.h>
+#include <dali/internal/graphics/gles/egl-graphics.h>
 #include <dali/internal/adaptor/common/adaptor-impl.h>
 
 namespace Dali
diff --git a/dali/internal/imaging/ubuntu-x11/native-image-source-impl-x.cpp b/dali/internal/imaging/ubuntu-x11/native-image-source-impl-x.cpp
index be32323..f3bd587 100644
--- a/dali/internal/imaging/ubuntu-x11/native-image-source-impl-x.cpp
+++ b/dali/internal/imaging/ubuntu-x11/native-image-source-impl-x.cpp
@@ -26,7 +26,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/internal/graphics/common/egl-image-extensions.h>
-#include <dali/internal/graphics/gles20/egl-graphics.h>
+#include <dali/internal/graphics/gles/egl-graphics.h>
 #include <dali/internal/adaptor/common/adaptor-impl.h>
 #include <dali/devel-api/adaptor-framework/bitmap-saver.h>
 #include <dali/integration-api/render-surface.h>
diff --git a/dali/internal/imaging/ubuntu-x11/native-image-source-queue-impl-x.cpp b/dali/internal/imaging/ubuntu-x11/native-image-source-queue-impl-x.cpp
index 3e44a25..1ed1421 100644
--- a/dali/internal/imaging/ubuntu-x11/native-image-source-queue-impl-x.cpp
+++ b/dali/internal/imaging/ubuntu-x11/native-image-source-queue-impl-x.cpp
@@ -24,7 +24,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/internal/graphics/common/egl-image-extensions.h>
-#include <dali/internal/graphics/gles20/egl-graphics.h>
+#include <dali/internal/graphics/gles/egl-graphics.h>
 #include <dali/internal/adaptor/common/adaptor-impl.h>
 
 namespace Dali
diff --git a/dali/internal/window-system/common/display-connection-impl.h b/dali/internal/window-system/common/display-connection-impl.h
index 8322e6e..b5fe5b3 100644
--- a/dali/internal/window-system/common/display-connection-impl.h
+++ b/dali/internal/window-system/common/display-connection-impl.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali/internal/window-system/common/display-connection.h>
 #include <dali/public-api/object/base-object.h>
-#include <dali/internal/graphics/gles20/egl-implementation.h>
+#include <dali/internal/graphics/gles/egl-implementation.h>
 
 
 namespace Dali
diff --git a/dali/internal/window-system/common/window-base.h b/dali/internal/window-system/common/window-base.h
index ec4f805..91a958c 100644
--- a/dali/internal/window-system/common/window-base.h
+++ b/dali/internal/window-system/common/window-base.h
@@ -25,7 +25,7 @@
 #include <dali/internal/window-system/common/indicator-interface.h>
 #include <dali/internal/window-system/common/damage-observer.h>
 #include <dali/internal/window-system/common/rotation-observer.h>
-#include <dali/internal/graphics/gles20/egl-implementation.h>
+#include <dali/internal/graphics/gles/egl-implementation.h>
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/events/key-event-integ.h>
diff --git a/dali/internal/window-system/common/window-render-surface.cpp b/dali/internal/window-system/common/window-render-surface.cpp
index 04bc79b..d97ffd2 100644
--- a/dali/internal/window-system/common/window-render-surface.cpp
+++ b/dali/internal/window-system/common/window-render-surface.cpp
@@ -25,12 +25,12 @@
 // INTERNAL INCLUDES
 #include <dali/integration-api/trigger-event-factory-interface.h>
 #include <dali/integration-api/thread-synchronization-interface.h>
-#include <dali/internal/graphics/gles20/egl-implementation.h>
+#include <dali/internal/graphics/gles/egl-implementation.h>
 #include <dali/internal/adaptor/common/adaptor-impl.h>
 #include <dali/internal/window-system/common/window-base.h>
 #include <dali/internal/window-system/common/window-factory.h>
 #include <dali/internal/window-system/common/window-system.h>
-#include <dali/internal/graphics/gles20/egl-graphics.h>
+#include <dali/internal/graphics/gles/egl-graphics.h>
 
 
 namespace Dali
diff --git a/dali/internal/window-system/tizen-wayland/display-connection-impl-ecore-wl.cpp b/dali/internal/window-system/tizen-wayland/display-connection-impl-ecore-wl.cpp
index 0dae2e9..195eda2 100755
--- a/dali/internal/window-system/tizen-wayland/display-connection-impl-ecore-wl.cpp
+++ b/dali/internal/window-system/tizen-wayland/display-connection-impl-ecore-wl.cpp
@@ -17,7 +17,7 @@
 
 // CLASS HEADER
 #include <dali/internal/window-system/tizen-wayland/display-connection-impl-ecore-wl.h>
-#include <dali/internal/graphics/gles20/egl-graphics.h>
+#include <dali/internal/graphics/gles/egl-graphics.h>
 
 // EXTERNAL_HEADERS
 #include <dali/integration-api/debug.h>
diff --git a/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.cpp b/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.cpp
index 66364cc..a39f707 100644
--- a/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.cpp
+++ b/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.cpp
@@ -33,8 +33,8 @@
 
 // INTERNAL INCLUDES
 #include <dali/internal/system/common/trigger-event.h>
-#include <dali/internal/graphics/gles20/egl-implementation.h>
-#include <dali/internal/graphics/gles20/egl-graphics.h>
+#include <dali/internal/graphics/gles/egl-implementation.h>
+#include <dali/internal/graphics/gles/egl-graphics.h>
 #include <dali/internal/window-system/common/display-connection.h>
 #include <dali/internal/window-system/common/window-system.h>
 #include <dali/integration-api/thread-synchronization-interface.h>
diff --git a/dali/internal/window-system/ubuntu-x11/display-connection-impl-x.cpp b/dali/internal/window-system/ubuntu-x11/display-connection-impl-x.cpp
index 9cf7d61..e605892 100644
--- a/dali/internal/window-system/ubuntu-x11/display-connection-impl-x.cpp
+++ b/dali/internal/window-system/ubuntu-x11/display-connection-impl-x.cpp
@@ -24,7 +24,7 @@
 
 // INTERNAL HEADERS
 #include <dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h>
-#include <dali/internal/graphics/gles20/egl-graphics.h>
+#include <dali/internal/graphics/gles/egl-graphics.h>
 
 namespace Dali
 {
diff --git a/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.cpp b/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.cpp
index 910098a..bd31ff8 100644
--- a/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.cpp
+++ b/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.cpp
@@ -34,7 +34,7 @@
 #include <dali/integration-api/thread-synchronization-interface.h>
 #include <dali/internal/system/common/trigger-event.h>
 #include <dali/internal/window-system/common/display-connection.h>
-#include <dali/internal/graphics/gles20/egl-graphics.h>
+#include <dali/internal/graphics/gles/egl-graphics.h>
 
 
 namespace Dali
diff --git a/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h b/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h
index 471092f..48868cc 100644
--- a/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h
+++ b/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h
@@ -20,7 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/integration-api/egl-interface.h>
-#include <dali/internal/graphics/gles20/egl-implementation.h>
+#include <dali/internal/graphics/gles/egl-implementation.h>
 #include <dali/internal/window-system/common/pixmap-render-surface.h>
 #include <dali/internal/window-system/ubuntu-x11/ecore-x-types.h>
 #include <dali/public-api/dali-adaptor-common.h>