/*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 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.
SceneHolder::~SceneHolder()
{
+ if(mScene)
+ {
+ // The scene graph object should be removed first.
+ mScene.RemoveSceneObject();
+ }
+
if(mAdaptor)
{
mAdaptor->RemoveObserver(*mLifeCycleObserver.get());
mAdaptor->RemoveWindow(this);
+ // The event queue is flushed and we wait for the completion of the surface removal
mAdaptor->DeleteSurface(*mSurface.get());
mAdaptor = nullptr;
if(mScene)
{
+ // We should remove the surface from the Core last
mScene.Discard();
}
}
LOG_UPDATE_RENDER_TRACE;
// For thread safe
- bool uploadOnly = mUploadWithoutRendering;
- unsigned int surfaceResized = mSurfaceResized;
+ bool uploadOnly = mUploadWithoutRendering;
+ unsigned int surfaceResized = mSurfaceResized;
+ Dali::RenderSurfaceInterface* deletedSurface = ShouldSurfaceBeDeleted();
// Performance statistics are logged upon a VSYNC tick so use this point for a VSync marker
AddPerformanceMarker(PerformanceInterface::VSYNC);
//////////////////////////////
// DELETE SURFACE
//////////////////////////////
-
- Dali::RenderSurfaceInterface* deletedSurface = ShouldSurfaceBeDeleted();
if(DALI_UNLIKELY(deletedSurface))
{
LOG_UPDATE_RENDER_TRACE_FMT("Deleting Surface");
/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 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.
namespace Dali::Graphics::GLES
{
-
RenderTarget::RenderTarget(const Graphics::RenderTargetCreateInfo& createInfo, Graphics::EglGraphicsController& controller)
: RenderTargetResource(createInfo, controller)
{
void RenderTarget::DestroyResource()
{
- // This is a proper destructor
- if(mCreateInfo.surface)
- {
- mController.DeleteSurfaceContext(static_cast<Dali::RenderSurfaceInterface*>(mCreateInfo.surface));
- }
}
void RenderTarget::DiscardResource()
{
mController.DiscardResource(this);
+
+ // The surface context should be deleted now
+ if(mCreateInfo.surface)
+ {
+ mController.DeleteSurfaceContext(static_cast<Dali::RenderSurfaceInterface*>(mCreateInfo.surface));
+ mCreateInfo.surface = nullptr;
+ }
}
GLES::Framebuffer* RenderTarget::GetFramebuffer() const
return mCreateInfo.surface;
}
-} // namespace Dali::Graphics::GLES
\ No newline at end of file
+} // namespace Dali::Graphics::GLES