Revert "[3.0] Add texture target for OES_EGL_image_external"

This reverts commit b1e2f0fa75dba64f7af69605b69904ff543d093c.

Change-Id: Iad38a41b464c63c25dd18067a9d48404cdda872b

diff --git a/adaptors/tizen/native-image-source-impl-tizen.cpp b/adaptors/tizen/native-image-source-impl-tizen.cpp
index e998ed4..57c8d43 100755 (executable)
--- a/adaptors/tizen/native-image-source-impl-tizen.cpp
+++ b/adaptors/tizen/native-image-source-impl-tizen.cpp
@@ -20,7 +20,6 @@
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
-#include <dali/integration-api/gl-defines.h>
 #include <cstring>
 
 // INTERNAL INCLUDES
@@ -450,11 +449,6 @@ 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 48876f0..3f16926 100755 (executable)
--- a/adaptors/tizen/native-image-source-impl.h
+++ b/adaptors/tizen/native-image-source-impl.h
@@ -154,11 +154,6 @@ 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 30ebca1..f361280 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,11 +19,8 @@
  */
 
 // 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
 {
@@ -36,8 +33,6 @@ 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