projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initialized SG::Scene::mGraphicsController in constructor
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
update
/
common
/
scene-graph-scene.cpp
diff --git
a/dali/internal/update/common/scene-graph-scene.cpp
b/dali/internal/update/common/scene-graph-scene.cpp
index
9360c32
..
2aa0287
100644
(file)
--- a/
dali/internal/update/common/scene-graph-scene.cpp
+++ b/
dali/internal/update/common/scene-graph-scene.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 202
1
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
2
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.
@@
-49,7
+49,7
@@
void Scene::Initialize(Graphics::Controller& graphicsController, Integration::De
mGraphicsController = &graphicsController;
// Create the render target for the surface. It should already have been sent via message.
mGraphicsController = &graphicsController;
// Create the render target for the surface. It should already have been sent via message.
- mRenderTarget =
mGraphicsController->
CreateRenderTarget(mRenderTargetCreateInfo, std::move(mRenderTarget));
+ mRenderTarget =
graphicsController.
CreateRenderTarget(mRenderTargetCreateInfo, std::move(mRenderTarget));
// Create the render pass for the surface
std::vector<Graphics::AttachmentDescription> attachmentDescriptions;
// Create the render pass for the surface
std::vector<Graphics::AttachmentDescription> attachmentDescriptions;
@@
-199,7
+199,10
@@
void Scene::SetSurfaceRenderTargetCreateInfo(const Graphics::RenderTargetCreateI
{
// Only recreate if the surface has changed.
mRenderTargetCreateInfo = renderTargetCreateInfo;
{
// Only recreate if the surface has changed.
mRenderTargetCreateInfo = renderTargetCreateInfo;
- mRenderTarget = mGraphicsController->CreateRenderTarget(renderTargetCreateInfo, std::move(mRenderTarget));
+ if(mGraphicsController) // shouldn't be null, as we can't have already set mRenderTarget unless graphics controller exists.
+ {
+ mRenderTarget = mGraphicsController->CreateRenderTarget(renderTargetCreateInfo, std::move(mRenderTarget));
+ }
}
else
{
}
else
{