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
Const correctness improvements for Property::Value.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
video-view
/
video-view-impl.cpp
diff --git
a/dali-toolkit/internal/controls/video-view/video-view-impl.cpp
b/dali-toolkit/internal/controls/video-view/video-view-impl.cpp
index
2e34f27
..
523fcf0
100644
(file)
--- a/
dali-toolkit/internal/controls/video-view/video-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/video-view/video-view-impl.cpp
@@
-88,7
+88,7
@@
const char* const CUSTOM_SAMPLER_TYPE_NAME( "samplerExternalOES" );
const char* VERTEX_SHADER = DALI_COMPOSE_SHADER(
attribute mediump vec2 aPosition;\n
uniform highp mat4 uMvpMatrix;\n
const char* VERTEX_SHADER = DALI_COMPOSE_SHADER(
attribute mediump vec2 aPosition;\n
uniform highp mat4 uMvpMatrix;\n
- uniform
mediump
vec3 uSize;\n
+ uniform
highp
vec3 uSize;\n
\n
void main()\n
{\n
\n
void main()\n
{\n
@@
-110,7
+110,7
@@
const char* VERTEX_SHADER_TEXTURE = DALI_COMPOSE_SHADER(
attribute mediump vec2 aPosition;\n
varying mediump vec2 vTexCoord;\n
uniform highp mat4 uMvpMatrix;\n
attribute mediump vec2 aPosition;\n
varying mediump vec2 vTexCoord;\n
uniform highp mat4 uMvpMatrix;\n
- uniform
mediump
vec3 uSize;\n
+ uniform
highp
vec3 uSize;\n
varying mediump vec2 sTexCoordRect;\n
void main()\n
{\n
varying mediump vec2 sTexCoordRect;\n
void main()\n
{\n
@@
-552,9
+552,9
@@
void VideoView::SetDepthIndex( int depthIndex )
}
}
}
}
-void VideoView::OnS
tag
eConnection( int depth )
+void VideoView::OnS
cen
eConnection( int depth )
{
{
- Control::OnS
tag
eConnection( depth );
+ Control::OnS
cen
eConnection( depth );
if( mIsUnderlay )
{
if( mIsUnderlay )
{
@@
-562,9
+562,9
@@
void VideoView::OnStageConnection( int depth )
}
}
}
}
-void VideoView::OnS
tag
eDisconnection()
+void VideoView::OnS
cen
eDisconnection()
{
{
- Control::OnS
tag
eDisconnection();
+ Control::OnS
cen
eDisconnection();
}
void VideoView::OnSizeSet( const Vector3& targetSize )
}
void VideoView::OnSizeSet( const Vector3& targetSize )