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
Remove RenderSurface from Core
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
render
/
common
/
render-instruction.h
diff --git
a/dali/internal/render/common/render-instruction.h
b/dali/internal/render/common/render-instruction.h
index
536f28d
..
1152321
100644
(file)
--- a/
dali/internal/render/common/render-instruction.h
+++ b/
dali/internal/render/common/render-instruction.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_INTERNAL_SCENE_GRAPH_RENDER_INSTRUCTION_H__
-#define
__DALI_INTERNAL_SCENE_GRAPH_RENDER_INSTRUCTION_H__
+#ifndef
DALI_INTERNAL_SCENE_GRAPH_RENDER_INSTRUCTION_H
+#define
DALI_INTERNAL_SCENE_GRAPH_RENDER_INSTRUCTION_H
/*
/*
- * Copyright (c) 20
16
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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.
@@
-24,6
+24,7
@@
#include <dali/internal/update/render-tasks/scene-graph-camera.h>
#include <dali/internal/render/common/render-list.h>
#include <dali/internal/render/renderers/render-frame-buffer.h>
#include <dali/internal/update/render-tasks/scene-graph-camera.h>
#include <dali/internal/render/common/render-list.h>
#include <dali/internal/render/renderers/render-frame-buffer.h>
+#include <dali/internal/render/gl-resources/context.h>
namespace Dali
{
namespace Dali
{
@@
-98,7
+99,6
@@
public:
* @param[in] clearColor A pointer to a color to clear with, or NULL if no clear is required.
*/
void Reset( Camera* camera,
* @param[in] clearColor A pointer to a color to clear with, or NULL if no clear is required.
*/
void Reset( Camera* camera,
- unsigned int offscreenId,
Render::FrameBuffer* frameBuffer,
const Viewport* viewport,
const Vector4* clearColor );
Render::FrameBuffer* frameBuffer,
const Viewport* viewport,
const Vector4* clearColor );
@@
-124,6
+124,11
@@
public:
// inlined as this is called once per frame per render instruction
return &mCamera->GetProjectionMatrix( index );
}
// inlined as this is called once per frame per render instruction
return &mCamera->GetProjectionMatrix( index );
}
+ // for reflection effect
+ const Camera* GetCamera() const
+ {
+ return mCamera;
+ }
private:
private:
@@
-140,10
+145,12
@@
public: // Data
Vector4 mClearColor; ///< Optional color to clear with
bool mIsViewportSet:1; ///< Flag to determine whether the viewport is set
bool mIsClearColorSet:1; ///< Flag to determine whether the clearColor is set
Vector4 mClearColor; ///< Optional color to clear with
bool mIsViewportSet:1; ///< Flag to determine whether the viewport is set
bool mIsClearColorSet:1; ///< Flag to determine whether the clearColor is set
+ bool mIgnoreRenderToFbo:1; ///< Whether to ignore the render to FBO option (used to measure the performance above 60 fps)
- unsigned int mOffscreenTextureId; ///< Optional offscreen target
Render::FrameBuffer* mFrameBuffer;
Render::FrameBuffer* mFrameBuffer;
+ Context* mContext; ///< The context holding the GL state of rendering
+
private: // Data
Camera* mCamera; ///< camera that is used
private: // Data
Camera* mCamera; ///< camera that is used
@@
-158,4
+165,4
@@
private: // Data
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_INTERNAL_SCENE_GRAPH_RENDER_INSTRUCTION_H__
+#endif //
DALI_INTERNAL_SCENE_GRAPH_RENDER_INSTRUCTION_H