From b47b167881305d2b72f271f1fc87935e61220433 Mon Sep 17 00:00:00 2001 From: "Seungho, Baek" Date: Mon, 18 Mar 2019 15:36:57 +0900 Subject: [PATCH 1/1] Remove DALI_GLES_VERSION compile option in dali-core - Add SetGlesVersion function - Add GetGlesVersion function - Add TextureRequiresConverting function Change-Id: Ic01546c6b91b73912490ae1a222d56649ed9eb64 Signed-off-by: Seungho, Baek --- .../dali-toolkit-test-utils/test-gl-abstraction.cpp | 12 +++++++++++- .../dali-toolkit-test-utils/test-gl-abstraction.h | 6 +++++- .../shared-javascript-and-cpp-documentation/build-guide.md | 2 +- .../shared-javascript-and-cpp-documentation/stage-hand.md | 2 +- 4 files changed, 18 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..8372e03 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,16 @@ void TestGlAbstraction::PostRender() { } +bool TestGlAbstraction::IsSurfacelessContextSupported() const +{ + return true; +} + +bool TestGlAbstraction::TextureRequiresConverting( const GLenum imageGlFormat, const GLenum textureGlFormat, const bool isSubImage ) const +{ + return ( ( imageGlFormat == GL_RGB ) && ( textureGlFormat == GL_RGBA ) ); +} + } // 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..6572dbc 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,10 @@ public: void PreRender(); void PostRender(); + bool IsSurfacelessContextSupported() const; + + bool TextureRequiresConverting( const GLenum imageGlFormat, const GLenum textureGlFormat, const bool isSubImage ) const; + /* 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