projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Tizen] Implement partial update
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
render
/
renderers
/
render-renderer.h
diff --git
a/dali/internal/render/renderers/render-renderer.h
b/dali/internal/render/renderers/render-renderer.h
index
55bac57
..
9157d72
100755
(executable)
--- a/
dali/internal/render/renderers/render-renderer.h
+++ b/
dali/internal/render/renderers/render-renderer.h
@@
-2,7
+2,7
@@
#define DALI_INTERNAL_RENDER_RENDERER_H
/*
#define DALI_INTERNAL_RENDER_RENDERER_H
/*
- * Copyright (c) 201
8
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
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.
@@
-114,7
+114,7
@@
public:
*/
static Renderer* New( SceneGraph::RenderDataProvider* dataProviders,
Render::Geometry* geometry,
*/
static Renderer* New( SceneGraph::RenderDataProvider* dataProviders,
Render::Geometry* geometry,
- u
nsigned in
t blendingBitmask,
+ u
int32_
t blendingBitmask,
const Vector4& blendColor,
FaceCullingMode::Type faceCullingMode,
bool preMultipliedAlphaEnabled,
const Vector4& blendColor,
FaceCullingMode::Type faceCullingMode,
bool preMultipliedAlphaEnabled,
@@
-138,7
+138,7
@@
public:
*/
Renderer( SceneGraph::RenderDataProvider* dataProviders,
Render::Geometry* geometry,
*/
Renderer( SceneGraph::RenderDataProvider* dataProviders,
Render::Geometry* geometry,
- u
nsigned in
t blendingBitmask,
+ u
int32_
t blendingBitmask,
const Vector4& blendColor,
FaceCullingMode::Type faceCullingMode,
bool preMultipliedAlphaEnabled,
const Vector4& blendColor,
FaceCullingMode::Type faceCullingMode,
bool preMultipliedAlphaEnabled,
@@
-175,7
+175,7
@@
public:
* Set the bitmask for blending options
* @param[in] bitmask A bitmask of blending options.
*/
* Set the bitmask for blending options
* @param[in] bitmask A bitmask of blending options.
*/
- void SetBlendingBitMask( u
nsigned in
t bitmask );
+ void SetBlendingBitMask( u
int32_
t bitmask );
/**
* Set the blend color for blending options
/**
* Set the blend color for blending options
@@
-187,13
+187,13
@@
public:
* Set the first element index to draw by the indexed draw
* @param[in] firstElement index of first element to draw
*/
* Set the first element index to draw by the indexed draw
* @param[in] firstElement index of first element to draw
*/
- void SetIndexedDrawFirstElement(
size
_t firstElement );
+ void SetIndexedDrawFirstElement(
uint32
_t firstElement );
/**
* Set the number of elements to draw by the indexed draw
* @param[in] elementsCount number of elements to draw
*/
/**
* Set the number of elements to draw by the indexed draw
* @param[in] elementsCount number of elements to draw
*/
- void SetIndexedDrawElementsCount(
size
_t elementsCount );
+ void SetIndexedDrawElementsCount(
uint32
_t elementsCount );
/**
* @brief Set whether the Pre-multiplied Alpha Blending is required
/**
* @brief Set whether the Pre-multiplied Alpha Blending is required
@@
-335,6
+335,12
@@
public:
StencilOperation::Type GetStencilOperationOnZPass() const;
/**
StencilOperation::Type GetStencilOperationOnZPass() const;
/**
+ * Called to upload during RenderManager::Render().
+ * @param[in] context The context used for uploading
+ */
+ void Upload( Context& context );
+
+ /**
* Called to render during RenderManager::Render().
* @param[in] context The context used for rendering
* @param[in] bufferIndex The index of the previous update buffer.
* Called to render during RenderManager::Render().
* @param[in] context The context used for rendering
* @param[in] bufferIndex The index of the previous update buffer.
@@
-344,6
+350,7
@@
public:
* @param[in] projectionMatrix The projection matrix.
* @param[in] size Size of the render item
* @param[in] blend If true, blending is enabled
* @param[in] projectionMatrix The projection matrix.
* @param[in] size Size of the render item
* @param[in] blend If true, blending is enabled
+ * @param[in] boundTextures The textures bound for rendering
*/
void Render( Context& context,
BufferIndex bufferIndex,
*/
void Render( Context& context,
BufferIndex bufferIndex,
@@
-353,7
+360,8
@@
public:
const Matrix& viewMatrix,
const Matrix& projectionMatrix,
const Vector3& size,
const Matrix& viewMatrix,
const Matrix& projectionMatrix,
const Vector3& size,
- bool blend );
+ bool blend,
+ Vector<GLuint>& boundTextures );
/**
* Write the renderer's sort attributes to the passed in reference
/**
* Write the renderer's sort attributes to the passed in reference
@@
-401,9
+409,10
@@
private:
* Bind the textures and setup the samplers
* @param[in] context The GL context
* @param[in] program The shader program
* Bind the textures and setup the samplers
* @param[in] context The GL context
* @param[in] program The shader program
+ * @param[in] boundTextures The textures bound for rendering
* @return False if create or bind failed, true if success.
*/
* @return False if create or bind failed, true if success.
*/
- bool BindTextures( Context& context, Program& program );
+ bool BindTextures( Context& context, Program& program
, Vector<GLuint>& boundTextures
);
private:
private:
@@
-414,7
+423,7
@@
private:
struct UniformIndexMap
{
struct UniformIndexMap
{
- u
nsigned int
uniformIndex; ///< The index of the cached location in the Program
+ u
int32_t
uniformIndex; ///< The index of the cached location in the Program
const PropertyInputImpl* propertyValue;
};
const PropertyInputImpl* propertyValue;
};
@@
-426,8
+435,8
@@
private:
StencilParameters mStencilParameters; ///< Struct containing all stencil related options
BlendingOptions mBlendingOptions; ///< Blending options including blend color, blend func and blend equation
StencilParameters mStencilParameters; ///< Struct containing all stencil related options
BlendingOptions mBlendingOptions; ///< Blending options including blend color, blend func and blend equation
-
size_t
mIndexedDrawFirstElement; ///< Offset of first element to draw
-
size_t
mIndexedDrawElementsCount; ///< Number of elements to draw
+
uint32_t
mIndexedDrawFirstElement; ///< Offset of first element to draw
+
uint32_t
mIndexedDrawElementsCount; ///< Number of elements to draw
DepthFunction::Type mDepthFunction:4; ///< The depth function
FaceCullingMode::Type mFaceCullingMode:3; ///< The mode of face culling
DepthFunction::Type mDepthFunction:4; ///< The depth function
FaceCullingMode::Type mFaceCullingMode:3; ///< The mode of face culling