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
Merge "Clear font cache when locale changed" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
test-native-image.h
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-native-image.h
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-native-image.h
index
fb9451c
..
cbbef46
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-native-image.h
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-native-image.h
@@
-2,7
+2,7
@@
#define TEST_NATIVE_IMAGE_H
/*
#define TEST_NATIVE_IMAGE_H
/*
- * Copyright (c) 202
1
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
3
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-78,11
+78,6
@@
public:
mCallStack.PushCall("GetTextureTarget", "");
return GL_TEXTURE_EXTERNAL_OES;
};
mCallStack.PushCall("GetTextureTarget", "");
return GL_TEXTURE_EXTERNAL_OES;
};
- inline virtual const char* GetCustomFragmentPrefix() const
- {
- mCallStack.PushCall("GetCustomFragmentPrefix", "");
- return "#extension GL_OES_EGL_image_external:require\n";
- };
inline virtual bool ApplyNativeFragmentShader(std::string& shader)
{
mCallStack.PushCall("ApplyNativeFragmentShader", "");
inline virtual bool ApplyNativeFragmentShader(std::string& shader)
{
mCallStack.PushCall("ApplyNativeFragmentShader", "");
@@
-112,20
+107,31
@@
public:
};
inline bool SourceChanged() const override
{
};
inline bool SourceChanged() const override
{
- return
fals
e;
+ return
tru
e;
};
};
+ inline Rect<uint32_t> GetUpdatedArea() override
+ {
+ return mUpdatedArea;
+ }
+
inline virtual Dali::NativeImageInterface::Extension* GetExtension()
{
return nullptr;
}
inline virtual Dali::NativeImageInterface::Extension* GetExtension()
{
return nullptr;
}
+ inline void SetUpdatedArea(const Rect<uint32_t>& updatedArea)
+ {
+ mUpdatedArea = updatedArea;
+ }
+
private:
TestNativeImage(uint32_t width, uint32_t height);
virtual ~TestNativeImage();
private:
TestNativeImage(uint32_t width, uint32_t height);
virtual ~TestNativeImage();
- uint32_t mWidth;
- uint32_t mHeight;
+ uint32_t mWidth;
+ uint32_t mHeight;
+ Rect<uint32_t> mUpdatedArea{};
public:
int32_t mExtensionCreateCalls;
public:
int32_t mExtensionCreateCalls;