projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dali_2.3.28] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
gl-view
/
gl-view-impl.cpp
diff --git
a/dali-toolkit/internal/controls/gl-view/gl-view-impl.cpp
b/dali-toolkit/internal/controls/gl-view/gl-view-impl.cpp
index
2eaf78c
..
11fe19d
100644
(file)
--- a/
dali-toolkit/internal/controls/gl-view/gl-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/gl-view/gl-view-impl.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 202
1
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
4
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-40,14
+40,14
@@
namespace Internal
{
Dali::Toolkit::GlView GlView::New(Dali::Toolkit::GlView::ColorFormat colorFormat)
{
{
Dali::Toolkit::GlView GlView::New(Dali::Toolkit::GlView::ColorFormat colorFormat)
{
- auto* impl = new Dali::Toolkit::Internal::GlView(colorFormat);
+ auto*
impl = new Dali::Toolkit::Internal::GlView(colorFormat);
Dali::Toolkit::GlView handle = Dali::Toolkit::GlView(*impl);
impl->Initialize();
return handle;
}
GlView::GlView(Dali::Toolkit::GlView::ColorFormat colorFormat)
Dali::Toolkit::GlView handle = Dali::Toolkit::GlView(*impl);
impl->Initialize();
return handle;
}
GlView::GlView(Dali::Toolkit::GlView::ColorFormat colorFormat)
-: Dali::Toolkit::Internal::GlViewImpl(
Toolkit::GlView::BackendMode::EGL_IMAGE_OFFSCREEN_RENDERING
),
+: Dali::Toolkit::Internal::GlViewImpl(
Toolkit::GlView::BackendMode::EGL_IMAGE_OFFSCREEN_RENDERING
),
mRenderThread(nullptr),
mNativeImageQueue(nullptr),
mRenderingMode(Toolkit::GlView::RenderingMode::CONTINUOUS),
mRenderThread(nullptr),
mNativeImageQueue(nullptr),
mRenderingMode(Toolkit::GlView::RenderingMode::CONTINUOUS),
@@
-147,6
+147,11
@@
void GlView::RenderOnce()
}
}
}
}
+void GlView::BindTextureResources(std::vector<Dali::Texture> textures)
+{
+ // Not supported in the indirect mode
+}
+
void GlView::OnInitialize()
{
//Create NativeImageSourceQueue with the size of 1,1
void GlView::OnInitialize()
{
//Create NativeImageSourceQueue with the size of 1,1
@@
-171,7
+176,7
@@
void GlView::OnInitialize()
}
//Adding VisibilityChange Signal.
}
//Adding VisibilityChange Signal.
-
Dali::DevelActor::VisibilityChangedSignal(self).Connect(this, &GlView::OnControl
VisibilityChanged);
+
self.InheritedVisibilityChangedSignal().Connect(this, &GlView::OnControlInherited
VisibilityChanged);
}
void GlView::OnSizeSet(const Vector3& targetSize)
}
void GlView::OnSizeSet(const Vector3& targetSize)
@@
-199,24
+204,21
@@
Shader GlView::CreateShader()
mNativeImageQueue->ApplyNativeFragmentShader(fragmentShader);
}
mNativeImageQueue->ApplyNativeFragmentShader(fragmentShader);
}
- return Shader::New(SHADER_GL_VIEW_VERT, fragmentShader);
+ return Shader::New(SHADER_GL_VIEW_VERT, fragmentShader
, Shader::Hint::NONE, "GL_VIEW"
);
}
}
-void GlView::OnControl
VisibilityChanged(Dali::Actor actor, bool visible, Dali::DevelActor::VisibilityChange::Type typ
e)
+void GlView::OnControl
InheritedVisibilityChanged(Dali::Actor actor, bool visibl
e)
{
Actor self = Self();
{
Actor self = Self();
- if(
self.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE)
)
+ if(
mRenderThread
)
{
{
- if(
mRenderThread
)
+ if(
visible && DevelWindow::Get(self).IsVisible()
)
{
{
- if(visible && DevelWindow::Get(self).IsVisible())
- {
- mRenderThread->Resume();
- }
- else
- {
- mRenderThread->Pause();
- }
+ mRenderThread->Resume();
+ }
+ else
+ {
+ mRenderThread->Pause();
}
}
}
}
}
}
@@
-245,24
+247,19
@@
void GlView::OnSceneConnection(int depth)
if(window)
{
if(window)
{
+ mPlacementWindow = window;
DevelWindow::VisibilityChangedSignal(window).Connect(this, &GlView::OnWindowVisibilityChanged);
}
DevelWindow::VisibilityChangedSignal(window).Connect(this, &GlView::OnWindowVisibilityChanged);
}
-
- if(mRenderThread)
- {
- if(self.GetProperty<bool>(Actor::Property::VISIBLE) && window.IsVisible())
- {
- mRenderThread->Resume();
- }
- }
}
void GlView::OnSceneDisconnection()
{
Control::OnSceneDisconnection();
}
void GlView::OnSceneDisconnection()
{
Control::OnSceneDisconnection();
- if(mRenderThread)
+ Window window = mPlacementWindow.GetHandle();
+ if(window)
{
{
- mRenderThread->Pause();
+ DevelWindow::VisibilityChangedSignal(window).Disconnect(this, &GlView::OnWindowVisibilityChanged);
+ mPlacementWindow.Reset();
}
}
}
}