Remove dali-core dependency of GLES version.

 - Add ConvertTexture function

Change-Id: I5fc750ad1623d39f158ac3d70af68d23d9995219
Signed-off-by: Seungho, Baek <sbsh.baek@samsung.com>

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 02439bccec73c94989ebe0c8caa3cc07ebc3816d..44c6a33134a452f159309dff4aa893d4d01de38e 100644 (file)
--- 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 c68573b03af0f01786ab5fac32a829ebbe308c23..c69e4e3e426265d1857f7eca9479a9c3e01680eb 100644 (file)
--- 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 d6cd7e17c7ed05b17ee73504345be109637c01c0..9a35da8099b536d62b03105adc9b1e6afc57b4e2 100644 (file)
--- 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 0fb72c62e089103769aab8e2a691645fde996c0f..a11e875f68d3f6a6b512c86da28f99feee5af709 100644 (file)
--- 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.