Remove GlView from vulkan build

Change-Id: I58cc77ffc872c2f7033cc80d729355b78deeadd8

diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index 056af0b996a0e038762fd6b0deff3f8c021d2bb1..13fe82c711978b1d5629259a11bb3a5bb28d4cbf 100644 (file)
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -31,6 +31,7 @@ OPTION(ENABLE_I18N               "Turns on internationalisation" OFF)
 OPTION(ENABLE_COVERAGE           "Coverage" OFF)
 OPTION(ENABLE_PKG_CONFIGURE      "Use pkgconfig" ON)
 OPTION(ENABLE_LINK_TEST          "Enable the link test" ON)
+OPTION(ENABLE_VULKAN             "Enable Vulkan instead of GLES" OFF)
 OPTION(INSTALL_DOXYGEN_DOC       "Install doxygen doc" ON)
 OPTION(CONFIGURE_AUTOMATED_TESTS "Configure automated tests" ON)
 OPTION(USE_DEFAULT_RESOURCE_DIR  "Whether to use the default resource folders. Otherwise set environment variables for DALI_IMAGE_DIR, DALI_SOUND_DIR, DALI_STYLE_DIR, DALI_STYLE_IMAGE_DIR and DALI_DATA_READ_ONLY_DIR" ON)
@@ -359,6 +360,13 @@ IF ( WIN32 )
   FIND_PACKAGE( pthreads REQUIRED )
 ENDIF()
 
+IF( NOT ENABLE_VULKAN)
+  SET(SOURCES ${SOURCES}
+    ${toolkit_internal_egl_src_files}
+    ${public_api_egl_src_files}
+  )
+ENDIF()
+
 ADD_LIBRARY( ${name} ${LIBTYPE} ${SOURCES} )
 
 SET(CUSTOM_COMPILE_OPTIONS "")
@@ -640,6 +648,7 @@ MESSAGE( STATUS "Debug build:                   " ${ENABLE_DEBUG} )
 MESSAGE( STATUS "Export all symbols:            " ${ENABLE_EXPORTALL} )
 MESSAGE( STATUS "Coverage:                      " ${ENABLE_COVERAGE} )
 MESSAGE( STATUS "Trace:                         " ${ENABLE_TRACE} )
+MESSAGE( STATUS "Vulkan:                        " ${ENABLE_VULKAN} )
 MESSAGE( STATUS "Doxygen:                       " ${doxygenEnabled} )
 MESSAGE( STATUS "Data Dir (Read/Write):         " ${dataReadWriteDir} )
 MESSAGE( STATUS "Data Dir (Read Only):          " ${dataReadOnlyDir} )

diff --git a/dali-toolkit/internal/file.list b/dali-toolkit/internal/file.list
index e20bddd126870abd744078429b2ac3048eed59cc..661ccaedc70fe211d06d0f307eacddab3ecad96d 100644 (file)
--- a/dali-toolkit/internal/file.list
+++ b/dali-toolkit/internal/file.list
@@ -129,10 +129,6 @@ SET( toolkit_src_files
    ${toolkit_src_dir}/controls/video-view/video-view-impl.cpp
    ${toolkit_src_dir}/controls/web-view/web-view-impl.cpp
    ${toolkit_src_dir}/controls/camera-view/camera-view-impl.cpp
-   ${toolkit_src_dir}/controls/gl-view/drawable-view-impl.cpp
-   ${toolkit_src_dir}/controls/gl-view/drawable-view-native-renderer.cpp
-   ${toolkit_src_dir}/controls/gl-view/gl-view-impl.cpp
-   ${toolkit_src_dir}/controls/gl-view/gl-view-render-thread.cpp
    ${toolkit_src_dir}/accessibility-manager/accessibility-manager-impl.cpp
    ${toolkit_src_dir}/feedback/feedback-style.cpp
    ${toolkit_src_dir}/focus-manager/keyboard-focus-manager-impl.cpp
@@ -255,6 +251,13 @@ SET( toolkit_src_files
    ${toolkit_src_dir}/text/text-geometry.cpp
 )
 
+SET(toolkit_internal_egl_src_files
+   ${toolkit_src_dir}/controls/gl-view/drawable-view-impl.cpp
+   ${toolkit_src_dir}/controls/gl-view/drawable-view-native-renderer.cpp
+   ${toolkit_src_dir}/controls/gl-view/gl-view-impl.cpp
+   ${toolkit_src_dir}/controls/gl-view/gl-view-render-thread.cpp
+)
+
 SET( SOURCES ${SOURCES}
   ${toolkit_src_files}
 )

diff --git a/dali-toolkit/public-api/file.list b/dali-toolkit/public-api/file.list
index 6da20124df8fa9ee6b1599e5276c6a5043799707..0a69c83c3ee85f9ee1486f0527e46986ff5a6a70 100644 (file)
--- a/dali-toolkit/public-api/file.list
+++ b/dali-toolkit/public-api/file.list
@@ -29,7 +29,6 @@ SET( public_api_src_files
   ${public_api_src_dir}/controls/text-controls/text-field.cpp
   ${public_api_src_dir}/controls/video-view/video-view.cpp
   ${public_api_src_dir}/controls/camera-view/camera-view.cpp
-  ${public_api_src_dir}/controls/gl-view/gl-view.cpp
   ${public_api_src_dir}/image-loader/image.cpp
   ${public_api_src_dir}/image-loader/image-url.cpp
   ${public_api_src_dir}/image-loader/async-image-loader.cpp
@@ -53,6 +52,10 @@ SET( public_api_src_files
   ${public_api_src_dir}/enums.cpp
 )
 
+SET(public_api_egl_src_files
+  ${public_api_src_dir}/controls/gl-view/gl-view.cpp
+)
+
 # Add public header files here
 SET( public_api_header_files
   ${public_api_src_dir}/dali-toolkit-version.h