projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Tizen] Fix surface deletion order
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
graphics
/
gles-impl
/
gles-graphics-render-target.cpp
diff --git
a/dali/internal/graphics/gles-impl/gles-graphics-render-target.cpp
b/dali/internal/graphics/gles-impl/gles-graphics-render-target.cpp
index
8cfd3f1
..
b8171ae
100644
(file)
--- a/
dali/internal/graphics/gles-impl/gles-graphics-render-target.cpp
+++ b/
dali/internal/graphics/gles-impl/gles-graphics-render-target.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 202
1
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
3
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.
@@
-25,7
+25,6
@@
namespace Dali::Graphics::GLES
{
namespace Dali::Graphics::GLES
{
-
RenderTarget::RenderTarget(const Graphics::RenderTargetCreateInfo& createInfo, Graphics::EglGraphicsController& controller)
: RenderTargetResource(createInfo, controller)
{
RenderTarget::RenderTarget(const Graphics::RenderTargetCreateInfo& createInfo, Graphics::EglGraphicsController& controller)
: RenderTargetResource(createInfo, controller)
{
@@
-39,16
+38,18
@@
RenderTarget::~RenderTarget() = default;
void RenderTarget::DestroyResource()
{
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);
}
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
}
GLES::Framebuffer* RenderTarget::GetFramebuffer() const
@@
-61,4
+62,4
@@
Surface* RenderTarget::GetSurface() const
return mCreateInfo.surface;
}
return mCreateInfo.surface;
}
-} // namespace Dali::Graphics::GLES
\ No newline at end of file
+} // namespace Dali::Graphics::GLES