projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dali_2.1.32] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-native-image-source.cpp
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-native-image-source.cpp
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-native-image-source.cpp
index
11bd75b
..
d2be2d7
100755
(executable)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-native-image-source.cpp
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-native-image-source.cpp
@@
-18,12
+18,20
@@
// CLASS HEADER
#include <dali/public-api/adaptor-framework/native-image-source.h>
// CLASS HEADER
#include <dali/public-api/adaptor-framework/native-image-source.h>
+// INTERNAL INCLUDES
+#include "test-native-image-source.h"
+
// EXTERNAL INCLUDES
#include <dali/public-api/object/any.h>
namespace Dali
{
// EXTERNAL INCLUDES
#include <dali/public-api/object/any.h>
namespace Dali
{
+const char* NativeImageSourceTest::GetCustomFragmentPrefix()
+{
+ return "#extension GL_OES_EGL_image_external:require\n";
+}
+
NativeImageSourcePtr NativeImageSource::New( unsigned int width, unsigned int height, ColorDepth depth )
{
Any empty;
NativeImageSourcePtr NativeImageSource::New( unsigned int width, unsigned int height, ColorDepth depth )
{
Any empty;
@@
-100,9
+108,10
@@
int NativeImageSource::GetTextureTarget() const
return 0;
}
return 0;
}
-const char* NativeImageSource::GetCustomFragmentPrefix() const
+bool NativeImageSource::ApplyNativeFragmentShader(std::string& shader)
{
{
- return "";
+ shader = Dali::NativeImageSourceTest::GetCustomFragmentPrefix() + shader;
+ return true;
}
const char* NativeImageSource::GetCustomSamplerTypename() const
}
const char* NativeImageSource::GetCustomSamplerTypename() const