From 908670e8d7b3447b5201a7f9118cca881cf0a41e Mon Sep 17 00:00:00 2001 From: Richard Huang Date: Fri, 15 Mar 2019 14:02:16 +0000 Subject: [PATCH] Revert "Remove dali-core dependency of GLES version." This reverts commit b2e09d9eeceadc9153c97c64b93639d0c0a94b43. Change-Id: I1b4d68f82a91f1170ec5caab7a78e8a2353901b6 --- .../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, 4 insertions(+), 10 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 44c6a33..02439bc 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) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 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,10 +104,6 @@ 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 c69e4e3..c68573b 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) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 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,8 +59,6 @@ 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 9a35da8..d6cd7e1 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 +./configure --prefix=$DESKTOP_PREFIX --enable-profile=UBUNTU --enable-gles=20 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 a11e875..0fb72c6 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-networklogging +$ 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 ~~~ Once this RPM is installed, you can run your DALi application and connect Stagehand to it. -- 2.7.4