X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fcamera-view%2Fcamera-view-impl.cpp;h=772c1a038224727740063836a5672a99bb05537b;hp=9ca121b9fcd3e20d10cd6df8e3660aacb28eaee3;hb=bdbfbd90942156c5ecd2f2f1b3bfb3a8254e1cc3;hpb=1823d866b90e66014305b3a512d1cd3a8186bdf7 diff --git a/dali-toolkit/internal/controls/camera-view/camera-view-impl.cpp b/dali-toolkit/internal/controls/camera-view/camera-view-impl.cpp index 9ca121b..772c1a0 100644 --- a/dali-toolkit/internal/controls/camera-view/camera-view-impl.cpp +++ b/dali-toolkit/internal/controls/camera-view/camera-view-impl.cpp @@ -145,7 +145,7 @@ void CameraView::SetNativeImageTarget() mNativeTexture = Dali::Texture::New(*nativeImageSourcePtr); Dali::Geometry geometry = VisualFactoryCache::CreateQuadGeometry(); - Dali::Shader shader = CreateShader(nativeImageSourcePtr->GetCustomFragmentPrefix()); + Dali::Shader shader = CreateShader(nativeImageSourcePtr); Dali::TextureSet textureSet = Dali::TextureSet::New(); textureSet.SetTexture(0u, mNativeTexture); @@ -181,13 +181,12 @@ void CameraView::UpdateDisplayArea(Dali::PropertyNotification& source) mCameraPlayer.SetDisplayArea(mDisplayArea); } -Dali::Shader CameraView::CreateShader(const char* fragmentPrefix) +Dali::Shader CameraView::CreateShader(Dali::NativeImageSourcePtr nativeImageSourcePtr) { - std::string fragmentShader = fragmentPrefix; - std::string vertexShader; + std::string vertexShader = SHADER_VIDEO_VIEW_TEXTURE_VERT.data(); + std::string fragmentShader = SHADER_VIDEO_VIEW_TEXTURE_FRAG.data(); - vertexShader = SHADER_VIDEO_VIEW_TEXTURE_VERT.data(); - fragmentShader += SHADER_VIDEO_VIEW_TEXTURE_FRAG.data(); + nativeImageSourcePtr->ApplyNativeFragmentShader(fragmentShader); return Dali::Shader::New(vertexShader, fragmentShader); }