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 "Fix RemoteSVG UTC failed due to the proxy block (2)" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
visual-factory-cache.h
diff --git
a/dali-toolkit/internal/visuals/visual-factory-cache.h
b/dali-toolkit/internal/visuals/visual-factory-cache.h
index
b19bad4
..
6d9f28c
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-factory-cache.h
+++ b/
dali-toolkit/internal/visuals/visual-factory-cache.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_VISUAL_FACTORY_CACHE_H
/*
#define DALI_TOOLKIT_VISUAL_FACTORY_CACHE_H
/*
- * Copyright (c) 202
1
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
2
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.
@@
-25,9
+25,9
@@
#include <dali/public-api/rendering/shader.h>
// INTERNAL INCLUDES
#include <dali/public-api/rendering/shader.h>
// INTERNAL INCLUDES
+#include <dali-toolkit/internal/texture-manager/texture-manager-impl.h>
#include <dali-toolkit/internal/visuals/npatch-loader.h>
#include <dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h>
#include <dali-toolkit/internal/visuals/npatch-loader.h>
#include <dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h>
-#include <dali-toolkit/internal/visuals/texture-manager-impl.h>
#include <dali/devel-api/rendering/renderer-devel.h>
namespace Dali
#include <dali/devel-api/rendering/renderer-devel.h>
namespace Dali
@@
-84,12
+84,24
@@
public:
IMAGE_SHADER_ROUNDED_CORNER,
IMAGE_SHADER_BORDERLINE,
IMAGE_SHADER_ROUNDED_BORDERLINE,
IMAGE_SHADER_ROUNDED_CORNER,
IMAGE_SHADER_BORDERLINE,
IMAGE_SHADER_ROUNDED_BORDERLINE,
+ IMAGE_SHADER_MASKING,
+ IMAGE_SHADER_ROUNDED_CORNER_MASKING,
+ IMAGE_SHADER_BORDERLINE_MASKING,
+ IMAGE_SHADER_ROUNDED_BORDERLINE_MASKING,
IMAGE_SHADER_ATLAS_DEFAULT_WRAP,
IMAGE_SHADER_ATLAS_CUSTOM_WRAP,
IMAGE_SHADER_ATLAS_DEFAULT_WRAP,
IMAGE_SHADER_ATLAS_CUSTOM_WRAP,
+ IMAGE_SHADER_YUV_TO_RGB,
+ IMAGE_SHADER_ROUNDED_CORNER_YUV_TO_RGB,
+ IMAGE_SHADER_BORDERLINE_YUV_TO_RGB,
+ IMAGE_SHADER_ROUNDED_BORDERLINE_YUV_TO_RGB,
NATIVE_IMAGE_SHADER,
NATIVE_IMAGE_SHADER_ROUNDED_CORNER,
NATIVE_IMAGE_SHADER_BORDERLINE,
NATIVE_IMAGE_SHADER_ROUNDED_BORDERLINE,
NATIVE_IMAGE_SHADER,
NATIVE_IMAGE_SHADER_ROUNDED_CORNER,
NATIVE_IMAGE_SHADER_BORDERLINE,
NATIVE_IMAGE_SHADER_ROUNDED_BORDERLINE,
+ NATIVE_IMAGE_SHADER_MASKING,
+ NATIVE_IMAGE_SHADER_ROUNDED_CORNER_MASKING,
+ NATIVE_IMAGE_SHADER_BORDERLINE_MASKING,
+ NATIVE_IMAGE_SHADER_ROUNDED_BORDERLINE_MASKING,
NINE_PATCH_SHADER,
NINE_PATCH_MASK_SHADER,
TEXT_SHADER_MULTI_COLOR_TEXT,
NINE_PATCH_SHADER,
NINE_PATCH_MASK_SHADER,
TEXT_SHADER_MULTI_COLOR_TEXT,
@@
-201,8
+213,11
@@
public:
* @brief Update the broken image Renderer object
* @param[in,out] renderer renderer for broken image
* @param[in] size the size of actor
* @brief Update the broken image Renderer object
* @param[in,out] renderer renderer for broken image
* @param[in] size the size of actor
+ * @param[in] rendererIsImage True if input renderer use image shader already.
+ * If true, we don't need to create new renderer when broken image is single image.
+ * Most of user experience use normal images. So It can reduce runtime.
*/
*/
- void UpdateBrokenImageRenderer(Renderer& renderer, const Vector2& size);
+ void UpdateBrokenImageRenderer(Renderer& renderer, const Vector2& size
, const bool& rendererIsImage = true
);
public:
/**
public:
/**
@@
-224,10
+239,10
@@
public:
NPatchLoader& GetNPatchLoader();
/**
NPatchLoader& GetNPatchLoader();
/**
- * Get the SVG rasterization
thread
.
- * @return A raw pointer pointing to the SVG rasterization
thread
.
+ * Get the SVG rasterization
manager
.
+ * @return A raw pointer pointing to the SVG rasterization
manager
.
*/
*/
- SvgRasterize
Thread* GetSVGRasterizationThread
();
+ SvgRasterize
Manager* GetSVGRasterizationManager
();
/**
* Get the vector animation manager.
/**
* Get the vector animation manager.
@@
-298,12
+313,12
@@
private:
struct BrokenImageInfo
{
BrokenImageInfo()
struct BrokenImageInfo
{
BrokenImageInfo()
- :visualType(),
- url(""),
- npatchId(NPatchData::INVALID_NPATCH_DATA_ID),
- texture(),
- width(0),
- height(0)
+ :
visualType(),
+
url(""),
+
npatchId(NPatchData::INVALID_NPATCH_DATA_ID),
+
texture(),
+
width(0),
+
height(0)
{
}
{
}
@@
-312,22
+327,22
@@
private:
}
// Data
}
// Data
- VisualUrl::Type
visualType;
- std::string
url;
- NPatchData::NPatchDataId
npatchId;
- Texture
texture;
- uint32_t
width;
- uint32_t
height;
+ VisualUrl::Type visualType;
+ std::string url;
+ NPatchData::NPatchDataId npatchId;
+ Texture texture;
+ uint32_t width;
+ uint32_t height;
};
Geometry mGeometry[GEOMETRY_TYPE_MAX + 1];
Shader mShader[SHADER_TYPE_MAX + 1];
};
Geometry mGeometry[GEOMETRY_TYPE_MAX + 1];
Shader mShader[SHADER_TYPE_MAX + 1];
- ImageAtlasManagerPtr
mAtlasManager;
- TextureManager
mTextureManager;
- NPatchLoader
mNPatchLoader;
+ ImageAtlasManagerPtr mAtlasManager;
+ TextureManager mTextureManager;
+ NPatchLoader mNPatchLoader;
-
SvgRasterizeThread* mSvgRasterizeThread
;
+
std::unique_ptr<SvgRasterizeManager> mSvgRasterizeManager
;
std::unique_ptr<VectorAnimationManager> mVectorAnimationManager;
bool mPreMultiplyOnLoad;
std::vector<BrokenImageInfo> mBrokenImageInfoContainer;
std::unique_ptr<VectorAnimationManager> mVectorAnimationManager;
bool mPreMultiplyOnLoad;
std::vector<BrokenImageInfo> mBrokenImageInfoContainer;