Support Tizen 11

Author: JSUYA

build/config/BUILD.gn

@@ -138,18 +138,18 @@ config("system_cxx") {
   }
 
   include_dirs = []
-  if (api_version == "10.0") {
-    include_dirs += [
-      "${lib_path}/gcc/${gcc_target_triple}/14.2.0/include",
-      "${lib_path}/gcc/${gcc_target_triple}/14.2.0/include/c++",
-      "${lib_path}/gcc/${gcc_target_triple}/14.2.0/include/c++/${gcc_target_triple}",
-    ]
-  } else {
+  if (api_version == "6.0" || api_version == "6.5" || api_version == "7.0" || api_version == "8.0" || api_version == "9.0") {
     include_dirs += [
       "${lib_path}/gcc/${gcc_target_triple}/9.2.0/include",
       "${lib_path}/gcc/${gcc_target_triple}/9.2.0/include/c++",
       "${lib_path}/gcc/${gcc_target_triple}/9.2.0/include/c++/${gcc_target_triple}",
     ]
+  } else {
+    include_dirs += [
+      "${lib_path}/gcc/${gcc_target_triple}/14.2.0/include",
+      "${lib_path}/gcc/${gcc_target_triple}/14.2.0/include/c++",
+      "${lib_path}/gcc/${gcc_target_triple}/14.2.0/include/c++/${gcc_target_triple}",
+    ]
   }
 
   libs = [ "stdc++" ]

flutter/shell/platform/tizen/BUILD.gn

@@ -140,6 +140,28 @@ template("embedder") {
       ]
     }
 
+    # Convert version string "6.0", "6.5", etc. to integer 60, 65, etc.
+    api_version_numeric = 60
+    if (api_version == "6.0") {
+      api_version_numeric = "60"
+    } else if (api_version == "6.5") {
+      api_version_numeric = "65"
+    } else if (api_version == "7.0") {
+      api_version_numeric = "70"
+    } else if (api_version == "8.0") {
+      api_version_numeric = "80"
+    } else if (api_version == "9.0") {
+      api_version_numeric = "90"
+    } else if (api_version == "10.0") {
+      api_version_numeric = "100"
+    } else if (api_version == "11.0") {
+      api_version_numeric = "110"
+    }
+
+    defines += [
+      "TIZEN_API_VERSION_NUM=$api_version_numeric",
+    ]
+
     defines += invoker.defines
     defines += [ "FLUTTER_ENGINE_NO_PROTOTYPES" ]
 

flutter/shell/platform/tizen/flutter_tizen_nui.cc

@@ -5,7 +5,11 @@
 #include "public/flutter_tizen.h"
 
 #include <dali-toolkit/public-api/controls/image-view/image-view.h>
+#if TIZEN_API_VERSION_NUM >= 110
+#include <dali/devel-api/adaptor-framework/native-image-queue.h>
+#else
 #include <dali/devel-api/adaptor-framework/native-image-source-queue.h>
+#endif
 
 #include <memory>
 
@@ -36,7 +40,11 @@ FlutterDesktopViewRef FlutterDesktopViewCreateFromImageView(
       std::make_unique<flutter::TizenViewNui>(
           view_properties.width, view_properties.height,
           reinterpret_cast<Dali::Toolkit::ImageView*>(image_view),
+#if TIZEN_API_VERSION_NUM >= 110
+          reinterpret_cast<Dali::NativeImageQueue*>(native_image_queue),
+#else
           reinterpret_cast<Dali::NativeImageSourceQueue*>(native_image_queue),
+#endif
           default_window_id);
 
   auto view = std::make_unique<flutter::FlutterTizenView>(

flutter/shell/platform/tizen/tizen_renderer_egl.cc

@@ -9,8 +9,12 @@
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #ifdef NUI_SUPPORT
+#if TIZEN_API_VERSION_NUM >= 110
+#include <dali/devel-api/adaptor-framework/native-image-queue.h>
+#else
 #include <dali/devel-api/adaptor-framework/native-image-source-queue.h>
 #endif
+#endif
 #include <tbm_dummy_display.h>
 #include <tbm_surface.h>
 #include <tbm_surface_queue.h>
@@ -101,6 +105,13 @@ bool TizenRendererEgl::CreateSurface(void* render_target,
           reinterpret_cast<EGLNativeWindowType>(egl_window), attribs);
     } else {
 #ifdef NUI_SUPPORT
+#if TIZEN_API_VERSION_NUM >= 110
+      Dali::NativeImageQueuePtr dali_native_image_queue =
+          static_cast<Dali::NativeImageQueue*>(render_target);
+      tbm_surface_queue_h tbm_surface_queue_ =
+          Dali::AnyCast<tbm_surface_queue_h>(
+              dali_native_image_queue->GetNativeImageQueue());
+#else
       Dali::NativeImageSourceQueuePtr dali_native_image_queue =
           static_cast<Dali::NativeImageSourceQueue*>(render_target);
       tbm_surface_queue_h tbm_surface_queue_ =
@@ -109,6 +120,7 @@ bool TizenRendererEgl::CreateSurface(void* render_target,
       egl_surface_ = eglCreateWindowSurface(
           egl_display_, egl_config_,
           reinterpret_cast<EGLNativeWindowType>(tbm_surface_queue_), attribs);
+#endif
 #endif
     }
 

flutter/shell/platform/tizen/tizen_view_nui.cc

@@ -16,7 +16,11 @@ namespace flutter {
 TizenViewNui::TizenViewNui(int32_t width,
                            int32_t height,
                            Dali::Toolkit::ImageView* image_view,
+#if TIZEN_API_VERSION_NUM >= 110
+                           Dali::NativeImageQueuePtr native_image_queue,
+#else
                            Dali::NativeImageSourceQueuePtr native_image_queue,
+#endif
                            int32_t default_window_id)
     : TizenView(width, height),
       image_view_(image_view),

flutter/shell/platform/tizen/tizen_view_nui.h

@@ -7,7 +7,11 @@
 
 #include <dali-toolkit/public-api/controls/image-view/image-view.h>
 #include <dali/devel-api/adaptor-framework/event-thread-callback.h>
+#if TIZEN_API_VERSION_NUM >= 110
+#include <dali/devel-api/adaptor-framework/native-image-queue.h>
+#else
 #include <dali/devel-api/adaptor-framework/native-image-source-queue.h>
+#endif
 #include <dali/devel-api/common/stage.h>
 
 #include <memory>
@@ -21,7 +25,11 @@ class TizenViewNui : public TizenView {
   TizenViewNui(int32_t width,
                int32_t height,
                Dali::Toolkit::ImageView* image_view,
+#if TIZEN_API_VERSION_NUM >= 110
+               Dali::NativeImageQueuePtr native_image_queue,
+#else
                Dali::NativeImageSourceQueuePtr native_image_queue,
+#endif
                int32_t default_window_id);
 
   ~TizenViewNui();
@@ -67,7 +75,11 @@ class TizenViewNui : public TizenView {
   void RenderOnce();
 
   Dali::Toolkit::ImageView* image_view_ = nullptr;
+#if TIZEN_API_VERSION_NUM >= 110
+  Dali::NativeImageQueuePtr native_image_queue_;
+#else
   Dali::NativeImageSourceQueuePtr native_image_queue_;
+#endif
   int32_t default_window_id_;
   std::unique_ptr<Dali::EventThreadCallback> rendering_callback_;
 };