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.3.24] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
visual-string-constants.h
diff --git
a/dali-toolkit/internal/visuals/visual-string-constants.h
b/dali-toolkit/internal/visuals/visual-string-constants.h
index
b65292f
..
9835299
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-string-constants.h
+++ b/
dali-toolkit/internal/visuals/visual-string-constants.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_INTERNAL_VISUAL_STRING_CONSTANTS_H
/*
#define DALI_TOOLKIT_INTERNAL_VISUAL_STRING_CONSTANTS_H
/*
- * Copyright (c) 202
1
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
4
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.
@@
-32,6
+32,10
@@
extern const char* const VISUAL_TYPE;
extern const Dali::Scripting::StringEnum VISUAL_TYPE_TABLE[];
extern const unsigned int VISUAL_TYPE_TABLE_COUNT;
extern const Dali::Scripting::StringEnum VISUAL_TYPE_TABLE[];
extern const unsigned int VISUAL_TYPE_TABLE_COUNT;
+// Visual Shader type
+extern const Dali::Scripting::StringEnum VISUAL_SHADER_TYPE_TABLE[];
+extern const unsigned int VISUAL_SHADER_TYPE_TABLE_COUNT;
+
// Custom shader
extern const char* const CUSTOM_SHADER;
extern const char* const CUSTOM_VERTEX_SHADER;
// Custom shader
extern const char* const CUSTOM_SHADER;
extern const char* const CUSTOM_VERTEX_SHADER;
@@
-79,7
+83,6
@@
extern const char* const WRAP_MODE_UNIFORM_NAME;
extern const char* const IMAGE_WRAP_MODE_U;
extern const char* const IMAGE_WRAP_MODE_V;
extern const char* const IMAGE_BORDER;
extern const char* const IMAGE_WRAP_MODE_U;
extern const char* const IMAGE_WRAP_MODE_V;
extern const char* const IMAGE_BORDER;
-extern const char* const PIXEL_ALIGNED_UNIFORM_NAME;
extern const char* const ANIMATED_IMAGE_URLS_NAME;
extern const char* const BATCH_SIZE_NAME;
extern const char* const CACHE_SIZE_NAME;
extern const char* const ANIMATED_IMAGE_URLS_NAME;
extern const char* const BATCH_SIZE_NAME;
extern const char* const CACHE_SIZE_NAME;
@@
-108,6
+111,10
@@
extern const char* const ALPHA_MASK_URL;
extern const char* const REDRAW_IN_SCALING_DOWN_NAME;
extern const char* const MASKING_TYPE_NAME;
extern const char* const MASK_TEXTURE_RATIO_NAME;
extern const char* const REDRAW_IN_SCALING_DOWN_NAME;
extern const char* const MASKING_TYPE_NAME;
extern const char* const MASK_TEXTURE_RATIO_NAME;
+extern const char* const FAST_TRACK_UPLOADING_NAME;
+extern const char* const ENABLE_BROKEN_IMAGE;
+extern const char* const ENABLE_FRAME_CACHE;
+extern const char* const NOTIFY_AFTER_RASTERIZATION;
// Text visual
extern const char* const TEXT_PROPERTY;
// Text visual
extern const char* const TEXT_PROPERTY;