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
Re-instating test cases from old graphics backend
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-canvas-renderer.cpp
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-canvas-renderer.cpp
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-canvas-renderer.cpp
index
56c0cd8
..
43aa8ce
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-canvas-renderer.cpp
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-canvas-renderer.cpp
@@
-39,7
+39,7
@@
class CanvasRenderer: public Dali::BaseObject
public:
CanvasRenderer( const Vector2& size )
: mDrawable(nullptr),
public:
CanvasRenderer( const Vector2& size )
: mDrawable(nullptr),
- m
PixelBuffer( Devel::PixelBuffer::New(size.width, size.height, Dali::Pixel::RGBA8888
) ),
+ m
Texture ( Dali::Texture::New( Dali::TextureType::TEXTURE_2D, Pixel::RGBA8888, size.width, size.height
) ),
mSize(size),
mViewBox(size)
{
mSize(size),
mViewBox(size)
{
@@
-59,6
+59,11
@@
public:
return true;
}
return true;
}
+ Dali::Texture GetRasterizedTexture()
+ {
+ return mTexture;
+ }
+
bool Rasterize()
{
return true;
bool Rasterize()
{
return true;
@@
-97,12
+102,6
@@
public:
return false;
}
return false;
}
- Devel::PixelBuffer GetPixelBuffer()
- {
- return mPixelBuffer;
- }
-
-
bool SetSize(Vector2 size)
{
mSize = size;
bool SetSize(Vector2 size)
{
mSize = size;
@@
-137,7
+136,7
@@
public:
public:
Dali::CanvasRenderer::Drawable* mDrawable;
public:
Dali::CanvasRenderer::Drawable* mDrawable;
- D
evel::PixelBuffer mPixelBuffer
;
+ D
ali::Texture mTexture
;
Vector2 mSize;
Vector2 mViewBox;
};
Vector2 mSize;
Vector2 mViewBox;
};
@@
-200,9
+199,9
@@
bool CanvasRenderer::Rasterize()
return Internal::Adaptor::GetImplementation(*this).Rasterize();
}
return Internal::Adaptor::GetImplementation(*this).Rasterize();
}
-D
evel::PixelBuffer CanvasRenderer::GetPixelBuffer
()
+D
ali::Texture CanvasRenderer::GetRasterizedTexture
()
{
{
- return Internal::Adaptor::GetImplementation(*this).Get
PixelBuffer
();
+ return Internal::Adaptor::GetImplementation(*this).Get
RasterizedTexture
();
}
bool CanvasRenderer::AddDrawable(Dali::CanvasRenderer::Drawable& drawable)
}
bool CanvasRenderer::AddDrawable(Dali::CanvasRenderer::Drawable& drawable)