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
Revert "[Tizen] Implement partial update"
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
event
/
rendering
/
frame-buffer-impl.cpp
diff --git
a/dali/internal/event/rendering/frame-buffer-impl.cpp
b/dali/internal/event/rendering/frame-buffer-impl.cpp
index
33afe35
..
1703fd7
100644
(file)
--- a/
dali/internal/event/rendering/frame-buffer-impl.cpp
+++ b/
dali/internal/event/rendering/frame-buffer-impl.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
19
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.
@@
-53,10
+53,11
@@
Render::FrameBuffer* FrameBuffer::GetRenderObject() const
FrameBuffer::FrameBuffer( uint32_t width, uint32_t height, Mask attachments )
: mEventThreadServices( EventThreadServices::Get() ),
mRenderObject( NULL ),
FrameBuffer::FrameBuffer( uint32_t width, uint32_t height, Mask attachments )
: mEventThreadServices( EventThreadServices::Get() ),
mRenderObject( NULL ),
- mColor
( NULL )
,
+ mColor
{ nullptr }
,
mWidth( width ),
mHeight( height ),
mAttachments( attachments ),
mWidth( width ),
mHeight( height ),
mAttachments( attachments ),
+ mColorAttachmentCount( 0 ),
mIsSurfaceBacked( false )
{
}
mIsSurfaceBacked( false )
{
}
@@
-88,22
+89,28
@@
void FrameBuffer::AttachColorTexture( TexturePtr texture, uint32_t mipmapLevel,
}
else
{
}
else
{
- if( ( texture->GetWidth() / ( 1u << mipmapLevel )
== mWidth ) &&
- ( texture->GetHeight() / ( 1u << mipmapLevel )
=
= mHeight ) )
+ if( ( texture->GetWidth() / ( 1u << mipmapLevel )
!= mWidth ) ||
+ ( texture->GetHeight() / ( 1u << mipmapLevel )
!
= mHeight ) )
{
{
- mColor = texture;
- AttachColorTextureToFrameBuffer( mEventThreadServices.GetUpdateManager(), *mRenderObject, texture->GetRenderObject(), mipmapLevel, layer );
+ DALI_LOG_ERROR( "Failed to attach color texture to FrameBuffer: Size mismatch \n" );
+ }
+ else if ( mColorAttachmentCount >= Dali::DevelFrameBuffer::MAX_COLOR_ATTACHMENTS )
+ {
+ DALI_LOG_ERROR( "Failed to attach color texture to FrameBuffer: Exceeded maximum supported color attachments.\n" );
}
else
{
}
else
{
- DALI_LOG_ERROR( "Failed to attach color texture to FrameBuffer: Size mismatch \n" );
+ mColor[mColorAttachmentCount] = texture;
+ ++mColorAttachmentCount;
+
+ AttachColorTextureToFrameBuffer( mEventThreadServices.GetUpdateManager(), *mRenderObject, texture->GetRenderObject(), mipmapLevel, layer );
}
}
}
}
}
}
-Texture* FrameBuffer::GetColorTexture(
)
+Texture* FrameBuffer::GetColorTexture(
uint8_t index) const
{
{
- return
mIsSurfaceBacked ? nullptr : mColor
.Get();
+ return
( mIsSurfaceBacked || index >= mColorAttachmentCount ) ? nullptr : mColor[index]
.Get();
}
void FrameBuffer::SetSize( uint32_t width, uint32_t height )
}
void FrameBuffer::SetSize( uint32_t width, uint32_t height )
@@
-117,14
+124,6
@@
void FrameBuffer::SetSize( uint32_t width, uint32_t height )
}
}
}
}
-void FrameBuffer::SetBackgroundColor( const Vector4& color )
-{
- if( mRenderObject->IsSurfaceBacked() )
- {
- SetFrameBufferBackgroundColorMessage( mEventThreadServices.GetUpdateManager(), static_cast<Render::SurfaceFrameBuffer*>( mRenderObject ), color );
- }
-}
-
void FrameBuffer::MarkSurfaceAsInvalid()
{
if ( mIsSurfaceBacked )
void FrameBuffer::MarkSurfaceAsInvalid()
{
if ( mIsSurfaceBacked )