Fixed both the GLES & VK builds for LibUV-X11 & GLIB profiles

Change-Id: I5bab5c28a90f4c34aff9f143d758403ea07ec99c

diff --git a/build/tizen/profiles/glib-x11-profile.cmake b/build/tizen/profiles/glib-x11-profile.cmake
index 775d8d027193caff8a061547127ab2c158ef1c38..711a03f4d84731db5711ed28fc4b36787efd63c6 100644 (file)
--- a/build/tizen/profiles/glib-x11-profile.cmake
+++ b/build/tizen/profiles/glib-x11-profile.cmake
@@ -16,8 +16,6 @@ SET( SOURCES
         ${devel_api_src_files}
         ${adaptor_devel_api_text_abstraction_src_files}
         ${adaptor_graphics_common_src_files}
-        ${adaptor_graphics_gles_src_files}
-        ${adaptor_graphics_x11_src_files}
         ${adaptor_haptics_common_src_files}
         ${adaptor_imaging_common_src_files}
         ${adaptor_imaging_x11_src_files}
@@ -49,22 +47,24 @@ SET( SOURCES
 
 IF( ENABLE_VULKAN )
   SET(SOURCES ${SOURCES}
-    ${graphics_vulkan_src_files}
-    ${graphics_vulkan_x11_src_files}
+    ${adaptor_graphics_vulkan_src_files}
+    ${adaptor_graphics_vulkan_x11_src_files}
+    ${adaptor_imaging_x11_vulkan_src_files}
+    ${adaptor_libraries_spirv_reflect_src_files}
     ${adaptor_window_system_x11_vulkan_src_files}
   )
 ELSE()
   SET(SOURCES ${SOURCES}
     ${adaptor_devel_api_egl_src_files}
-    ${adaptor_graphics_gl_src_files}
+    ${adaptor_graphics_gles_src_files}
     ${adaptor_graphics_glib_x11_src_files}
-    ${adaptor_imaging_x11_src_files}
-    ${adaptor_window_system_common_egl_src_files}
+    ${adaptor_graphics_x11_src_files}
+    ${adaptor_imaging_x11_egl_src_files}
     ${adaptor_window_system_x11_egl_src_files}
+    ${adaptor_window_system_common_egl_src_files}
   )
 ENDIF()
 
-
 IF( ENABLE_VECTOR_BASED_TEXT_RENDERING )
     SET( SOURCES ${SOURCES}
          ${static_libraries_glyphy_src_files}

diff --git a/build/tizen/profiles/libuv-x11-profile.cmake b/build/tizen/profiles/libuv-x11-profile.cmake
index 7cc9876f8f0cff9405f549ce1d549a477efe7364..6631cd9af4f465ae950460e752505ea4cf45fd37 100644 (file)
--- a/build/tizen/profiles/libuv-x11-profile.cmake
+++ b/build/tizen/profiles/libuv-x11-profile.cmake
@@ -16,8 +16,6 @@ SET( SOURCES
         ${devel_api_src_files}
         ${adaptor_devel_api_text_abstraction_src_files}
         ${adaptor_graphics_common_src_files}
-        ${adaptor_graphics_gles_src_files}
-        ${adaptor_graphics_x11_src_files}
         ${adaptor_haptics_common_src_files}
         ${adaptor_imaging_common_src_files}
         ${adaptor_imaging_x11_src_files}
@@ -49,20 +47,19 @@ SET( SOURCES
 
 IF( ENABLE_VULKAN )
   SET(SOURCES ${SOURCES}
-    ${graphics_vulkan_src_files}
-    ${graphics_vulkan_x11_src_files}
-    ${adaptor_imaging_x11_src_files}
+    ${adaptor_graphics_vulkan_src_files}
+    ${adaptor_graphics_vulkan_x11_src_files}
+    ${adaptor_imaging_x11_vulkan_src_files}
+    ${adaptor_libraries_spirv_reflect_src_files}
     ${adaptor_window_system_x11_vulkan_src_files}
-    )
+  )
 ELSE()
   SET(SOURCES ${SOURCES}
     ${adaptor_devel_api_egl_src_files}
-
     ${adaptor_graphics_gles_src_files}
     ${adaptor_graphics_ubuntu_src_files}
-
+    ${adaptor_graphics_x11_src_files}
     ${adaptor_imaging_x11_egl_src_files}
-
     ${adaptor_window_system_x11_egl_src_files}
     ${adaptor_window_system_common_egl_src_files}
   )

diff --git a/dali/internal/imaging/file.list b/dali/internal/imaging/file.list
index 1d6829212b3af07431294dae933ab3a81a7e3300..957085a417f79649e800f56db8c0132be8307bb4 100644 (file)
--- a/dali/internal/imaging/file.list
+++ b/dali/internal/imaging/file.list
@@ -66,12 +66,19 @@ SET( adaptor_imaging_ubuntu_x11_vulkan_src_files
 SET( adaptor_imaging_x11_src_files
     ${adaptor_imaging_dir}/common/file-download.cpp
 )
+
+# module: imaging, backend: libuv-x11/glib / egl
 SET( adaptor_imaging_x11_egl_src_files
-    ${adaptor_imaging_dir}/x11/native-image-source-factory-x.cpp
+    ${adaptor_imaging_dir}/x11/native-image-source-factory-x-egl.cpp
     ${adaptor_imaging_dir}/x11/native-image-source-impl-x.cpp
     ${adaptor_imaging_dir}/x11/native-image-source-queue-impl-x.cpp
 )
 
+# module: imaging, backend: libuv-x11/glib / vulkan
+SET( adaptor_imaging_x11_vulkan_src_files
+    ${adaptor_imaging_dir}/x11/native-image-source-factory-x-vulkan.cpp
+)
+
 # module: imaging, backend: android
 SET( adaptor_imaging_android_src_files
     ${adaptor_imaging_dir}/common/file-download.cpp

diff --git a/dali/internal/imaging/x11/native-image-source-factory-x-egl.cpp b/dali/internal/imaging/x11/native-image-source-factory-x-egl.cpp
new file mode 100644 (file)
index 0000000..83d09fa
--- /dev/null
+++ b/dali/internal/imaging/x11/native-image-source-factory-x-egl.cpp
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali/internal/imaging/x11/native-image-source-factory-x.h>
+
+// INTERNAL HEADERS
+#include <dali/internal/imaging/x11/native-image-source-impl-x.h>
+#include <dali/internal/imaging/x11/native-image-source-queue-impl-x.h>
+
+namespace Dali
+{
+namespace Internal
+{
+namespace Adaptor
+{
+std::unique_ptr<NativeImageSource> NativeImageSourceFactoryX::CreateNativeImageSource(uint32_t width, uint32_t height, Dali::NativeImageSource::ColorDepth depth, Any nativeImageSource)
+{
+  return std::unique_ptr<NativeImageSource>(NativeImageSourceX::New(width, height, depth, nativeImageSource));
+}
+
+std::unique_ptr<NativeImageSourceQueue> NativeImageSourceFactoryX::CreateNativeImageSourceQueue(uint32_t queueCount, uint32_t width, uint32_t height, Dali::NativeImageSourceQueue::ColorFormat colorFormat, Any nativeImageSourceQueue)
+{
+  return std::unique_ptr<NativeImageSourceQueue>(NativeImageSourceQueueX::New(queueCount, width, height, colorFormat, nativeImageSourceQueue));
+}
+
+// this should be created from somewhere
+std::unique_ptr<NativeImageSourceFactory> GetNativeImageSourceFactory()
+{
+  // returns native image source factory
+  return std::unique_ptr<NativeImageSourceFactoryX>(new NativeImageSourceFactoryX());
+}
+
+} // namespace Adaptor
+} // namespace Internal
+} // namespace Dali

diff --git a/dali/internal/imaging/x11/native-image-source-factory-x-vulkan.cpp b/dali/internal/imaging/x11/native-image-source-factory-x-vulkan.cpp
new file mode 100644 (file)
index 0000000..d176270
--- /dev/null
+++ b/dali/internal/imaging/x11/native-image-source-factory-x-vulkan.cpp
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include <dali/internal/imaging/x11/native-image-source-factory-x.h>
+
+// INTERNAL INCLUDES
+#include <dali/internal/imaging/common/native-image-source-impl.h>
+#include <dali/internal/imaging/common/native-image-source-queue-impl.h>
+
+namespace Dali::Internal::Adaptor
+{
+std::unique_ptr<NativeImageSource> NativeImageSourceFactoryX::CreateNativeImageSource(uint32_t width, uint32_t height, Dali::NativeImageSource::ColorDepth depth, Any nativeImageSource)
+{
+  return nullptr;
+}
+
+std::unique_ptr<NativeImageSourceQueue> NativeImageSourceFactoryX::CreateNativeImageSourceQueue(uint32_t queueCount, uint32_t width, uint32_t height, Dali::NativeImageSourceQueue::ColorFormat colorFormat, Any nativeImageSourceQueue)
+{
+  return nullptr;
+}
+
+std::unique_ptr<NativeImageSourceFactory> GetNativeImageSourceFactory()
+{
+  // returns native image source factory
+  return std::unique_ptr<NativeImageSourceFactoryX>(new NativeImageSourceFactoryX());
+}
+
+} // namespace Dali::Internal::Adaptor

diff --git a/dali/internal/imaging/x11/native-image-source-factory-x.cpp b/dali/internal/imaging/x11/native-image-source-factory-x.cpp
deleted file mode 100644 (file)
index 83d09fa..0000000
--- a/dali/internal/imaging/x11/native-image-source-factory-x.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2024 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali/internal/imaging/x11/native-image-source-factory-x.h>
-
-// INTERNAL HEADERS
-#include <dali/internal/imaging/x11/native-image-source-impl-x.h>
-#include <dali/internal/imaging/x11/native-image-source-queue-impl-x.h>
-
-namespace Dali
-{
-namespace Internal
-{
-namespace Adaptor
-{
-std::unique_ptr<NativeImageSource> NativeImageSourceFactoryX::CreateNativeImageSource(uint32_t width, uint32_t height, Dali::NativeImageSource::ColorDepth depth, Any nativeImageSource)
-{
-  return std::unique_ptr<NativeImageSource>(NativeImageSourceX::New(width, height, depth, nativeImageSource));
-}
-
-std::unique_ptr<NativeImageSourceQueue> NativeImageSourceFactoryX::CreateNativeImageSourceQueue(uint32_t queueCount, uint32_t width, uint32_t height, Dali::NativeImageSourceQueue::ColorFormat colorFormat, Any nativeImageSourceQueue)
-{
-  return std::unique_ptr<NativeImageSourceQueue>(NativeImageSourceQueueX::New(queueCount, width, height, colorFormat, nativeImageSourceQueue));
-}
-
-// this should be created from somewhere
-std::unique_ptr<NativeImageSourceFactory> GetNativeImageSourceFactory()
-{
-  // returns native image source factory
-  return std::unique_ptr<NativeImageSourceFactoryX>(new NativeImageSourceFactoryX());
-}
-
-} // namespace Adaptor
-} // namespace Internal
-} // namespace Dali

diff --git a/dali/internal/window-system/x11/window-base-x.cpp b/dali/internal/window-system/x11/window-base-x.cpp
index f1164d1e42b3c9ed1c162715b9b1a1d3e15edeee..54350577a990655f52b8b0d58eae4f8e567de2e0 100644 (file)
--- a/dali/internal/window-system/x11/window-base-x.cpp
+++ b/dali/internal/window-system/x11/window-base-x.cpp
@@ -1058,7 +1058,7 @@ bool WindowBaseX::IsBottom()
   return false;
 }
 
-Any WindowBaseX::GetNativeBuffer()
+Any WindowBaseX::GetNativeBuffer() const
 {
   return 0;
 }