projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devel/master' into tizen
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
imaging
/
android
/
native-image-source-queue-impl-android.cpp
diff --git
a/dali/internal/imaging/android/native-image-source-queue-impl-android.cpp
b/dali/internal/imaging/android/native-image-source-queue-impl-android.cpp
index
ac9b53a
..
79e009f
100644
(file)
--- a/
dali/internal/imaging/android/native-image-source-queue-impl-android.cpp
+++ b/
dali/internal/imaging/android/native-image-source-queue-impl-android.cpp
@@
-98,11
+98,6
@@
void NativeImageSourceQueueAndroid::PrepareTexture()
{
}
-const char* NativeImageSourceQueueAndroid::GetCustomFragmentPrefix() const
-{
- return nullptr;
-}
-
bool NativeImageSourceQueueAndroid::ApplyNativeFragmentShader(std::string& shader)
{
return false;