From 2f7c84db2a15dd3e51b661e1bda9f20efbacac33 Mon Sep 17 00:00:00 2001 From: Seungho Baek Date: Wed, 26 Jun 2024 20:20:31 +0900 Subject: [PATCH] [Tizen] Revert "Use Texture for not file save case" This reverts commit a7c0a9730108102cc4a98f4c323cf51c3b508ac4. Change-Id: Ib9745ea065b287b9618aabf347d44a67b34b5e62 --- dali/internal/system/common/capture-impl.cpp | 33 +++++----------------------- dali/internal/system/common/capture-impl.h | 5 ----- dali/public-api/capture/capture.cpp | 5 ----- dali/public-api/capture/capture.h | 8 ------- 4 files changed, 5 insertions(+), 46 deletions(-) diff --git a/dali/internal/system/common/capture-impl.cpp b/dali/internal/system/common/capture-impl.cpp index b07500c..fc947fd 100644 --- a/dali/internal/system/common/capture-impl.cpp +++ b/dali/internal/system/common/capture-impl.cpp @@ -41,8 +41,8 @@ namespace Adaptor { namespace { -constexpr int32_t SHADER_VERSION_NATIVE_IMAGE_SOURCE_AVAILABLE = 300; -constexpr uint32_t TIME_OUT_DURATION = 1000; +constexpr int32_t GL_VERSION_NATIVE_IMAGE_SOURCE_AVAILABLE = 30; +constexpr uint32_t TIME_OUT_DURATION = 1000; } // namespace Capture::Capture() @@ -124,11 +124,6 @@ Dali::NativeImageSourcePtr Capture::GetNativeImageSource() const return mNativeImageSourcePtr; } -Dali::Texture Capture::GetTexture() const -{ - return mTexture; -} - Dali::Devel::PixelBuffer Capture::GetCapturedBuffer() { if(!mPixelBuffer || (mPixelBuffer && !mPixelBuffer.GetBuffer())) @@ -153,17 +148,10 @@ Dali::Capture::CaptureFinishedSignalType& Capture::FinishedSignal() void Capture::CreateTexture(const Vector2& size) { - if(mFileSave) + if(!mNativeImageSourcePtr) { - if(!mNativeImageSourcePtr) - { - mNativeImageSourcePtr = Dali::NativeImageSource::New(size.width, size.height, Dali::NativeImageSource::COLOR_DEPTH_DEFAULT); - mTexture = Dali::Texture::New(*mNativeImageSourcePtr); - } - } - else - { - mTexture = Dali::Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, unsigned(size.width), unsigned(size.height)); + mNativeImageSourcePtr = Dali::NativeImageSource::New(size.width, size.height, Dali::NativeImageSource::COLOR_DEPTH_DEFAULT); + mTexture = Dali::Texture::New(*mNativeImageSourcePtr); } } @@ -296,16 +284,6 @@ bool Capture::IsRenderTaskSetup() void Capture::SetupResources(const Dali::Vector2& position, const Dali::Vector2& size, const Dali::Vector4& clearColor, Dali::Actor source) { - Dali::Internal::Adaptor::Adaptor& adaptor = Internal::Adaptor::Adaptor::GetImplementation(Internal::Adaptor::Adaptor::Get()); - GraphicsInterface* graphics = &adaptor.GetGraphicsInterface(); - auto eglGraphics = static_cast(graphics); - - if(mFileSave && Dali::Shader::GetShaderLanguageVersion() < SHADER_VERSION_NATIVE_IMAGE_SOURCE_AVAILABLE) - { - DALI_LOG_ERROR("GLES is 2.0, we can't use native image source \n"); - mFileSave = false; - } - CreateTexture(size); CreateFrameBuffer(); @@ -371,7 +349,6 @@ bool Capture::SaveFile() { return Dali::DevelNativeImageSource::EncodeToFile(*mNativeImageSourcePtr, mPath, mQuality); } - return false; } diff --git a/dali/internal/system/common/capture-impl.h b/dali/internal/system/common/capture-impl.h index af143e2..5f6e594 100644 --- a/dali/internal/system/common/capture-impl.h +++ b/dali/internal/system/common/capture-impl.h @@ -91,11 +91,6 @@ public: Dali::Devel::PixelBuffer GetCapturedBuffer(); /** - * @copydoc Dali::Capture::GetTexture - */ - Dali::Texture GetTexture() const; - - /** * @copydoc Dali::Capture::FinishedSignal */ Dali::Capture::CaptureFinishedSignalType& FinishedSignal(); diff --git a/dali/public-api/capture/capture.cpp b/dali/public-api/capture/capture.cpp index e19a88c..faa5c1e 100644 --- a/dali/public-api/capture/capture.cpp +++ b/dali/public-api/capture/capture.cpp @@ -88,11 +88,6 @@ Dali::NativeImageSourcePtr Capture::GetNativeImageSource() const return GetImpl(*this).GetNativeImageSource(); } -Dali::Texture Capture::GetTexture() const -{ - return GetImpl(*this).GetTexture(); -} - Capture::CaptureFinishedSignalType& Capture::FinishedSignal() { return GetImpl(*this).FinishedSignal(); diff --git a/dali/public-api/capture/capture.h b/dali/public-api/capture/capture.h index 79b1a55..3dd9275 100644 --- a/dali/public-api/capture/capture.h +++ b/dali/public-api/capture/capture.h @@ -21,7 +21,6 @@ // EXTERNAL HEADERS #include #include -#include #include // INTERNAL INCLUDES @@ -261,13 +260,6 @@ public: Dali::NativeImageSourcePtr GetNativeImageSource() const; /** - * @brief Get Texture of captured image. - * - * @return Texture Captured result - */ - Dali::Texture GetTexture() const; - - /** * @brief Get finished signal. * * @SINCE_1_3_4 -- 2.7.4