From d6e2dc3f7cbcd739cdfdcfdabeebdc0b7c94ca5e Mon Sep 17 00:00:00 2001 From: Joogab Yun Date: Thu, 12 Apr 2018 10:22:19 +0900 Subject: [PATCH] Changed fragment shader for video playback. value of 0,0,0,0 is required for underlay video. the mixColor and uColor is not needed. Change-Id: I14db8c47e51afcc498bb229d0f1e353cfa7d447e --- dali-toolkit/internal/controls/video-view/video-view-impl.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) 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 3db94fa..baacf73 100755 --- a/dali-toolkit/internal/controls/video-view/video-view-impl.cpp +++ b/dali-toolkit/internal/controls/video-view/video-view-impl.cpp @@ -99,12 +99,10 @@ const char* VERTEX_SHADER = DALI_COMPOSE_SHADER( ); const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER( - uniform lowp vec4 uColor;\n - uniform lowp vec3 mixColor;\n \n void main()\n {\n - gl_FragColor = vec4(mixColor, 1.0)*uColor;\n + gl_FragColor = vec4(0.0);\n }\n ); @@ -620,12 +618,7 @@ void VideoView::SetWindowSurfaceTarget() Geometry geometry = VisualFactoryCache::CreateQuadGeometry(); Shader shader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER ); mOverlayRenderer = Renderer::New( geometry, shader ); - - mOverlayRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON ); - mOverlayRenderer.SetProperty( Renderer::Property::BLEND_FACTOR_SRC_RGB, BlendFactor::ONE ); - mOverlayRenderer.SetProperty( Renderer::Property::BLEND_FACTOR_DEST_RGB, BlendFactor::ZERO ); - mOverlayRenderer.SetProperty( Renderer::Property::BLEND_FACTOR_SRC_ALPHA, BlendFactor::ONE ); - mOverlayRenderer.SetProperty( Renderer::Property::BLEND_FACTOR_DEST_ALPHA, BlendFactor::ZERO ); + mOverlayRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::OFF ); } if( mIsPlay ) -- 2.7.4