projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disabling EmbossFilter now removes all render tasks.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
effects-view
/
effects-view-impl.cpp
diff --git
a/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp
b/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp
index
ed94ff8
..
0b207e4
100644
(file)
--- a/
dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp
@@
-137,7
+137,7
@@
Toolkit::EffectsView EffectsView::New()
}
EffectsView::EffectsView()
}
EffectsView::EffectsView()
-: Control( ControlBehaviour(
ACTOR_BEHAVIOUR_NONE
) ),
+: Control( ControlBehaviour(
CONTROL_BEHAVIOUR_DEFAULT
) ),
mChildrenRoot(Actor::New()),
mBackgroundColor( EFFECTS_VIEW_DEFAULT_BACKGROUND_COLOR ),
mTargetSize( Vector2::ZERO ),
mChildrenRoot(Actor::New()),
mBackgroundColor( EFFECTS_VIEW_DEFAULT_BACKGROUND_COLOR ),
mTargetSize( Vector2::ZERO ),
@@
-184,7
+184,8
@@
void EffectsView::SetType( Toolkit::EffectsView::EffectType type )
}
}
}
}
- Image dummyImage; // Dummy image, force creation of an image visual
+ FrameBufferImage dummyImage = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat );
+
InitializeVisual( self, mVisualPostFilter, dummyImage );
Property::Map customShader;
customShader[ Toolkit::Visual::Shader::Property::VERTEX_SHADER ] = EFFECTS_VIEW_VERTEX_SOURCE;
InitializeVisual( self, mVisualPostFilter, dummyImage );
Property::Map customShader;
customShader[ Toolkit::Visual::Shader::Property::VERTEX_SHADER ] = EFFECTS_VIEW_VERTEX_SOURCE;
@@
-213,6
+214,7
@@
void EffectsView::Disable()
// stop render tasks processing
// Note: render target resources are automatically freed since we set the Image::Unused flag
RemoveRenderTasks();
// stop render tasks processing
// Note: render target resources are automatically freed since we set the Image::Unused flag
RemoveRenderTasks();
+ mLastSize = Vector2::ZERO; // Ensure resources are reallocated on subsequent enable
mEnabled = false;
}
mEnabled = false;
}
@@
-435,11
+437,11
@@
void EffectsView::AllocateResources()
Actor self( Self() );
Actor self( Self() );
- mImageForChildren = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat
, Dali::Image::UNUSED
);
+ mImageForChildren = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat );
InitializeVisual( self, mVisualForChildren, mImageForChildren );
mVisualForChildren.SetDepthIndex( DepthIndex::CONTENT+1 );
InitializeVisual( self, mVisualForChildren, mImageForChildren );
mVisualForChildren.SetDepthIndex( DepthIndex::CONTENT+1 );
- mImagePostFilter = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat
, Dali::Image::UNUSED
);
+ mImagePostFilter = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat );
TextureSet textureSet = TextureSet::New();
TextureSetImage( textureSet, 0u, mImagePostFilter );
self.GetRendererAt( 0 ).SetTextures( textureSet );
TextureSet textureSet = TextureSet::New();
TextureSetImage( textureSet, 0u, mImagePostFilter );
self.GetRendererAt( 0 ).SetTextures( textureSet );