[dali_2.3.22] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / gl-view / gl-view.cpp

diff --git a/dali-toolkit/public-api/controls/gl-view/gl-view.cpp b/dali-toolkit/public-api/controls/gl-view/gl-view.cpp
index 77e75e8..5060566 100644 (file)
--- a/dali-toolkit/public-api/controls/gl-view/gl-view.cpp
+++ b/dali-toolkit/public-api/controls/gl-view/gl-view.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * 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.
@@ -24,16 +24,15 @@
 
 namespace Dali::Toolkit
 {
-
 GlView::GlView() = default;
 
 GlView::GlView(const GlView& GlView) = default;
 
-GlView::GlView(GlView&& rhs) = default;
+GlView::GlView(GlView&& rhs) noexcept = default;
 
 GlView& GlView::operator=(const GlView& GlView) = default;
 
-GlView& GlView::operator=(GlView&& rhs) = default;
+GlView& GlView::operator=(GlView&& rhs) noexcept = default;
 
 GlView::~GlView() = default;
 
@@ -41,7 +40,7 @@ GlView GlView::New(ColorFormat colorFormat)
 {
   // This function is backward compatible and always returns
   // backend based on NativeImage.
-  return Internal::GlView::New( colorFormat );
+  return Internal::GlView::New(colorFormat);
 }
 
 GlView GlView::New(BackendMode backendMode, ColorFormat colorFormat)
@@ -50,6 +49,7 @@ GlView GlView::New(BackendMode backendMode, ColorFormat colorFormat)
   {
     case BackendMode::DIRECT_RENDERING:
     case BackendMode::DIRECT_RENDERING_THREADED:
+    case BackendMode::UNSAFE_DIRECT_RENDERING:
     {
       return Internal::DrawableView::New(backendMode);
     }
@@ -105,6 +105,11 @@ void GlView::RenderOnce()
   Dali::Toolkit::GetImpl(*this).RenderOnce();
 }
 
+void GlView::BindTextureResources(std::vector<Dali::Texture> textures)
+{
+  Dali::Toolkit::GetImpl(*this).BindTextureResources(std::move(textures));
+}
+
 GlView::GlView(Internal::GlViewImpl& implementation)
 : Control(implementation)
 {
@@ -116,4 +121,4 @@ GlView::GlView(Dali::Internal::CustomActor* internal)
   VerifyCustomActorPointer<Internal::GlViewImpl>(internal);
 }
 
-} // namespace Dali
+} // namespace Dali::Toolkit