[3.0] Add texture target for OES_EGL_image_external

  Modify BindTexture part for native image source with OES_EGL_image_external

Change-Id: I4a06f28931ee8fe54b86ffe2088d7689686977ad

diff --git a/adaptors/tizen/native-image-source-impl-tizen.cpp b/adaptors/tizen/native-image-source-impl-tizen.cpp
index 57c8d43..e998ed4 100755 (executable)
--- a/adaptors/tizen/native-image-source-impl-tizen.cpp
+++ b/adaptors/tizen/native-image-source-impl-tizen.cpp
@@ -20,6 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
+#include <dali/integration-api/gl-defines.h>
 #include <cstring>
 
 // INTERNAL INCLUDES
@@ -449,6 +450,11 @@ const char* NativeImageSource::GetCustomSamplerTypename()
   return SAMPLER_TYPE;
 }
 
+int NativeImageSource::GetEglImageTextureTarget()
+{
+  return GL_TEXTURE_EXTERNAL_OES;
+}
+
 } // namespace Adaptor
 
 } // namespace internal

diff --git a/adaptors/tizen/native-image-source-impl.h b/adaptors/tizen/native-image-source-impl.h
index 3f16926..48876f0 100755 (executable)
--- a/adaptors/tizen/native-image-source-impl.h
+++ b/adaptors/tizen/native-image-source-impl.h
@@ -154,6 +154,11 @@ public:
    */
   const char* GetCustomSamplerTypename();
 
+  /**
+   * @copydoc Dali::NativeImageInterface::Extension::GetEglImageTextureTarget()
+   */
+  int GetEglImageTextureTarget();
+
 private:
 
   /**

diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-native-image.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-native-image.h
index f361280..30ebca1 100644 (file)
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-native-image.h
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-native-image.h
@@ -19,8 +19,11 @@
  */
 
 // INTERNAL INCLUDES
+
+// EXTERNAL INCLUDES
 #include <dali/public-api/images/native-image-interface.h>
 #include <dali/devel-api/images/native-image-interface-extension.h>
+#include <dali/integration-api/gl-defines.h>
 
 namespace Dali
 {
@@ -33,6 +36,8 @@ public:
   inline const char* GetCustomFragmentPreFix(){return "#extension GL_OES_EGL_image_external:require\n";}
   inline const char* GetCustomSamplerTypename(){return "samplerExternalOES";}
 
+  inline int GetEglImageTextureTarget(){return GL_TEXTURE_EXTERNAL_OES;}
+
 };
 
 class DALI_IMPORT_API TestNativeImage : public Dali::NativeImageInterface