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 "Make do not caching pixelBuffer in texture-manager." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
npatch
/
npatch-visual.cpp
diff --git
a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp
b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp
index
265dcd8
..
5c03ac2
100644
(file)
--- a/
dali-toolkit/internal/visuals/npatch/npatch-visual.cpp
+++ b/
dali-toolkit/internal/visuals/npatch/npatch-visual.cpp
@@
-19,7
+19,6
@@
#include "npatch-visual.h"
// EXTERNAL INCLUDES
#include "npatch-visual.h"
// EXTERNAL INCLUDES
-#include <dali/devel-api/object/handle-devel.h>
#include <dali/devel-api/rendering/renderer-devel.h>
#include <dali/devel-api/adaptor-framework/image-loading.h>
#include <dali/integration-api/debug.h>
#include <dali/devel-api/rendering/renderer-devel.h>
#include <dali/devel-api/adaptor-framework/image-loading.h>
#include <dali/integration-api/debug.h>
@@
-52,14
+51,14
@@
const char* VERTEX_SHADER = DALI_COMPOSE_SHADER(
varying mediump vec2 vTexCoord;\n
varying mediump vec2 vMaskTexCoord;\n
uniform highp mat4 uMvpMatrix;\n
varying mediump vec2 vTexCoord;\n
varying mediump vec2 vMaskTexCoord;\n
uniform highp mat4 uMvpMatrix;\n
- uniform
mediump
vec3 uSize;\n
+ uniform
highp
vec3 uSize;\n
uniform mediump vec2 uNinePatchFactorsX[ FACTOR_SIZE_X ];\n
uniform mediump vec2 uNinePatchFactorsY[ FACTOR_SIZE_Y ];\n
\n
// Visual size and offset
uniform mediump vec2 offset;\n
uniform mediump vec2 uNinePatchFactorsX[ FACTOR_SIZE_X ];\n
uniform mediump vec2 uNinePatchFactorsY[ FACTOR_SIZE_Y ];\n
\n
// Visual size and offset
uniform mediump vec2 offset;\n
- uniform
mediump
vec2 size;\n
+ uniform
highp
vec2 size;\n
uniform mediump vec4 offsetSizeMode;\n
uniform mediump vec2 origin;\n
uniform mediump vec2 anchorPoint;\n
uniform mediump vec4 offsetSizeMode;\n
uniform mediump vec2 origin;\n
uniform mediump vec2 anchorPoint;\n
@@
-94,13
+93,13
@@
const char* VERTEX_SHADER_3X3 = DALI_COMPOSE_SHADER(
varying mediump vec2 vTexCoord;\n
varying mediump vec2 vMaskTexCoord;\n
uniform highp mat4 uMvpMatrix;\n
varying mediump vec2 vTexCoord;\n
varying mediump vec2 vMaskTexCoord;\n
uniform highp mat4 uMvpMatrix;\n
- uniform
mediump
vec3 uSize;\n
+ uniform
highp
vec3 uSize;\n
uniform mediump vec2 uFixed[ 3 ];\n
uniform mediump vec2 uStretchTotal;\n
\n
//Visual size and offset
uniform mediump vec2 offset;\n
uniform mediump vec2 uFixed[ 3 ];\n
uniform mediump vec2 uStretchTotal;\n
\n
//Visual size and offset
uniform mediump vec2 offset;\n
- uniform
mediump
vec2 size;\n
+ uniform
highp
vec2 size;\n
uniform mediump vec4 offsetSizeMode;\n
uniform mediump vec2 origin;\n
uniform mediump vec2 anchorPoint;\n
uniform mediump vec4 offsetSizeMode;\n
uniform mediump vec2 origin;\n
uniform mediump vec2 anchorPoint;\n
@@
-181,15
+180,15
@@
Geometry GenerateGeometry( const Vector< Vector2 >& vertices, const Vector< unsi
{
Property::Map vertexFormat;
vertexFormat[ "aPosition" ] = Property::VECTOR2;
{
Property::Map vertexFormat;
vertexFormat[ "aPosition" ] = Property::VECTOR2;
-
PropertyBuffer vertexPropertyBuffer = Property
Buffer::New( vertexFormat );
+
VertexBuffer vertexBuffer = Vertex
Buffer::New( vertexFormat );
if( vertices.Size() > 0 )
{
if( vertices.Size() > 0 )
{
- vertex
Property
Buffer.SetData( &vertices[ 0 ], vertices.Size() );
+ vertexBuffer.SetData( &vertices[ 0 ], vertices.Size() );
}
// Create the geometry object
Geometry geometry = Geometry::New();
}
// Create the geometry object
Geometry geometry = Geometry::New();
- geometry.AddVertexBuffer( vertex
Property
Buffer );
+ geometry.AddVertexBuffer( vertexBuffer );
if( indices.Size() > 0 )
{
geometry.SetIndexBuffer( &indices[ 0 ], indices.Size() );
if( indices.Size() > 0 )
{
geometry.SetIndexBuffer( &indices[ 0 ], indices.Size() );
@@
-497,6
+496,10
@@
Geometry NPatchVisual::CreateGeometry()
{
uint32_t elementCount[2];
geometry = RenderingAddOn::Get().CreateGeometryGrid(data->renderingMap, Uint16Pair(3, 3), elementCount );
{
uint32_t elementCount[2];
geometry = RenderingAddOn::Get().CreateGeometryGrid(data->renderingMap, Uint16Pair(3, 3), elementCount );
+ if( mImpl->mRenderer )
+ {
+ RenderingAddOn::Get().SubmitRenderTask(mImpl->mRenderer, data->renderingMap);
+ }
}
else
{
}
else
{
@@
-516,6
+519,10
@@
Geometry NPatchVisual::CreateGeometry()
uint32_t elementCount[2];
geometry = !mBorderOnly ?
RenderingAddOn::Get().CreateGeometryGrid(data->renderingMap, gridSize, elementCount ) : CreateBorderGeometry(gridSize );
uint32_t elementCount[2];
geometry = !mBorderOnly ?
RenderingAddOn::Get().CreateGeometryGrid(data->renderingMap, gridSize, elementCount ) : CreateBorderGeometry(gridSize );
+ if( mImpl->mRenderer )
+ {
+ RenderingAddOn::Get().SubmitRenderTask(mImpl->mRenderer, data->renderingMap);
+ }
}
}
}
}
}
}
@@
-671,8
+678,8
@@
void NPatchVisual::ApplyTextureAndUniforms()
auxiliaryPixelData.GetHeight() );
texture.Upload( auxiliaryPixelData );
textureSet.SetTexture( 1, texture );
auxiliaryPixelData.GetHeight() );
texture.Upload( auxiliaryPixelData );
textureSet.SetTexture( 1, texture );
-
DevelHandle::RegisterProperty( mImpl->mRenderer,
DevelImageVisual::Property::AUXILIARY_IMAGE_ALPHA,
- AUXILIARY_IMAGE_ALPHA_NAME, mAuxiliaryImageAlpha );
+
mImpl->mRenderer.RegisterProperty(
DevelImageVisual::Property::AUXILIARY_IMAGE_ALPHA,
+
AUXILIARY_IMAGE_ALPHA_NAME, mAuxiliaryImageAlpha );
}
mImpl->mRenderer.SetTextures( textureSet );
}
mImpl->mRenderer.SetTextures( textureSet );
@@
-866,11
+873,17
@@
void NPatchVisual::LoadComplete( bool loadSuccess, Devel::PixelBuffer pixelBuffe
}
else
{
}
else
{
+ Devel::PixelBuffer loadedPixelBuffer;
if( loadSuccess )
{
if( loadSuccess )
{
-
mLoader.SetNPatchData( mId, pixelBuffer )
;
+
loadedPixelBuffer = pixelBuffer
;
EnablePreMultipliedAlpha( preMultiplied );
}
EnablePreMultipliedAlpha( preMultiplied );
}
+ else
+ {
+ loadedPixelBuffer = LoadImageFromFile( mFactoryCache.GetTextureManager().GetBrokenImageUrl() );
+ }
+ mLoader.SetNPatchData( loadSuccess, mId, loadedPixelBuffer, url, preMultiplied );
if( mAuxiliaryPixelBuffer || !mAuxiliaryUrl.IsValid() )
{
if( mAuxiliaryPixelBuffer || !mAuxiliaryUrl.IsValid() )
{