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 "Change the precision of size and uSize from mediumP to highP" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
wireframe
/
wireframe-visual.cpp
diff --git
a/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp
b/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp
index
5364de2
..
3707465
100644
(file)
--- a/
dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp
+++ b/
dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp
@@
-43,12
+43,12
@@
const char * const INDEX_NAME("indices");
const char* VERTEX_SHADER = DALI_COMPOSE_SHADER(
attribute mediump vec2 aPosition;\n
uniform highp mat4 uMvpMatrix;\n
const char* VERTEX_SHADER = DALI_COMPOSE_SHADER(
attribute mediump vec2 aPosition;\n
uniform highp mat4 uMvpMatrix;\n
-uniform
mediump
vec3 uSize;\n
+uniform
highp
vec3 uSize;\n
\n
//Visual size and offset
uniform mediump vec2 offset;\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
@@
-168,7
+168,7
@@
void WireframeVisual::DoSetProperties( const Property::Map& propertyMap )
}
}
}
}
-void WireframeVisual::DoSetOnS
tag
e( Actor& actor )
+void WireframeVisual::DoSetOnS
cen
e( Actor& actor )
{
InitializeRenderer();
{
InitializeRenderer();
@@
-216,7
+216,7
@@
Geometry WireframeVisual::CreateQuadWireframeGeometry()
Property::Map quadVertexFormat;
quadVertexFormat[POSITION_ATTRIBUTE_NAME] = Property::VECTOR2;
Property::Map quadVertexFormat;
quadVertexFormat[POSITION_ATTRIBUTE_NAME] = Property::VECTOR2;
-
PropertyBuffer quadVertices = Property
Buffer::New( quadVertexFormat );
+
VertexBuffer quadVertices = Vertex
Buffer::New( quadVertexFormat );
quadVertices.SetData( quadVertexData, 4 );
// Create indices
quadVertices.SetData( quadVertexData, 4 );
// Create indices