From b2e09d9eeceadc9153c97c64b93639d0c0a94b43 Mon Sep 17 00:00:00 2001 From: "Seungho, Baek" Date: Fri, 8 Mar 2019 15:12:26 +0900 Subject: [PATCH] Remove dali-core dependency of GLES version. - Add ConvertTexture function Change-Id: I5fc750ad1623d39f158ac3d70af68d23d9995219 Signed-off-by: Seungho, Baek --- .../dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.cpp | 6 +++++- .../src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h | 4 +++- docs/content/shared-javascript-and-cpp-documentation/build-guide.md | 2 +- docs/content/shared-javascript-and-cpp-documentation/stage-hand.md | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.cpp index 02439bc..44c6a33 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -104,6 +104,10 @@ void TestGlAbstraction::PostRender() { } +void TestGlAbstraction::ConvertTexture( uint8_t* buffer, GLenum& imageGlFormat, const uint32_t dataSize, const GLenum textureGlFormat, const bool isSubImage ) +{ +} + } // Namespace dali bool BlendEnabled(const Dali::TraceCallStack& callStack) diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h index c68573b..c69e4e3 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h @@ -2,7 +2,7 @@ #define TEST_GL_ABSTRACTION_H /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -59,6 +59,8 @@ public: void PreRender(); void PostRender(); + void ConvertTexture( uint8_t* buffer, GLenum& imageGlFormat, const uint32_t dataSize, const GLenum textureGlFormat, const bool isSubImage ); + /* OpenGL ES 2.0 */ inline void ActiveTexture( GLenum textureUnit ) diff --git a/docs/content/shared-javascript-and-cpp-documentation/build-guide.md b/docs/content/shared-javascript-and-cpp-documentation/build-guide.md index d6cd7e1..9a35da8 100644 --- a/docs/content/shared-javascript-and-cpp-documentation/build-guide.md +++ b/docs/content/shared-javascript-and-cpp-documentation/build-guide.md @@ -51,7 +51,7 @@ make install -j8 ~~~{.sh} cd dali-adaptor/build/tizen autoreconf --install -./configure --prefix=$DESKTOP_PREFIX --enable-profile=UBUNTU --enable-gles=20 +./configure --prefix=$DESKTOP_PREFIX --enable-profile=UBUNTU make install -j8 ~~~ diff --git a/docs/content/shared-javascript-and-cpp-documentation/stage-hand.md b/docs/content/shared-javascript-and-cpp-documentation/stage-hand.md index 0fb72c6..a11e875 100644 --- a/docs/content/shared-javascript-and-cpp-documentation/stage-hand.md +++ b/docs/content/shared-javascript-and-cpp-documentation/stage-hand.md @@ -44,7 +44,7 @@ Stagehand connects to DALi via network using a TCP/IP connection, to enable this Here is an example dali-adaptor configure line: ~~~ -$ CXXFLAGS="-g -O0 -Wno-unused-local-typedefs" CXX="ccache g++" ./configure --prefix=$DESKTOP_PREFIX --enable-debug=yes --enable-profile=UBUNTU --enable-gles=20 --enable-networklogging +$ CXXFLAGS="-g -O0 -Wno-unused-local-typedefs" CXX="ccache g++" ./configure --prefix=$DESKTOP_PREFIX --enable-debug=yes --enable-profile=UBUNTU --enable-networklogging ~~~ Once this RPM is installed, you can run your DALi application and connect Stagehand to it. -- 2.7.4