Some test cases were expecting a texture to be rendered, but weren't providing
pixel data. With the cleanup to Texture::Bind preventing a call to glBindTexture
without pixel data, this is no longer the case.
Added dummy pixel data to ensure the test cases pass.
Change-Id: I67268b3a4a9446ff5745bc43f7f9f67f13c5ff69
Signed-off-by: David Steele <david.steele@samsung.com>
Actor actor = Actor::New();
// For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied.
// Image with a size smaller than 512*512 will be uploaded as a part of the atlas.
Actor actor = Actor::New();
// For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied.
// Image with a size smaller than 512*512 will be uploaded as a part of the atlas.
+
+ const int width=512;
+ const int height=513;
+
+ Integration::Bitmap* bitmap = Integration::Bitmap::New( Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD );
+ bitmap->GetPackedPixelsProfile()->ReserveBuffer( Pixel::RGBA8888, width, height,width, height );
+
TestControlRendererRender( application, actor, controlRenderer, 1u,
TestControlRendererRender( application, actor, controlRenderer, 1u,
- ImageDimensions(512, 513),
- Integration::ResourcePointer(Integration::Bitmap::New(Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD)));
+ ImageDimensions(width, height),
+ Integration::ResourcePointer( bitmap ) );
TestGlAbstraction& gl = application.GetGlAbstraction();
int textureUnit = -1;
TestGlAbstraction& gl = application.GetGlAbstraction();
int textureUnit = -1;
Actor actor = Actor::New();
// For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied.
// Image with a size smaller than 512*512 will be uploaded as a part of the atlas.
Actor actor = Actor::New();
// For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied.
// Image with a size smaller than 512*512 will be uploaded as a part of the atlas.
+
+ const int width=512;
+ const int height=513;
+
+ Integration::Bitmap* bitmap = Integration::Bitmap::New( Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD );
+ bitmap->GetPackedPixelsProfile()->ReserveBuffer( Pixel::RGBA8888, width, height,width, height );
+
TestControlRendererRender( application, actor, controlRenderer, 1u,
TestControlRendererRender( application, actor, controlRenderer, 1u,
- ImageDimensions(512, 513),
- Integration::ResourcePointer(Integration::Bitmap::New(Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD)) );
+ ImageDimensions(width, height),
+ Integration::ResourcePointer(bitmap) );
TestGlAbstraction& gl = application.GetGlAbstraction();
int textureUnit = -1;
TestGlAbstraction& gl = application.GetGlAbstraction();
int textureUnit = -1;
DALI_TEST_CHECK( controlRenderer );
Actor actor = Actor::New();
DALI_TEST_CHECK( controlRenderer );
Actor actor = Actor::New();
//The testkit still has to load a bitmap for the broken renderer image
//The testkit still has to load a bitmap for the broken renderer image
+ Integration::Bitmap* bitmap = Integration::Bitmap::New(Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD);
+ bitmap->GetPackedPixelsProfile()->ReserveBuffer( Pixel::RGBA8888, 100, 100, 100, 100 );
TestControlRendererRender( application, actor, controlRenderer, 1u,
ImageDimensions(),
TestControlRendererRender( application, actor, controlRenderer, 1u,
ImageDimensions(),
- Integration::ResourcePointer(Integration::Bitmap::New(Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD)) );
+ Integration::ResourcePointer(bitmap) );
TestGlAbstraction& gl = application.GetGlAbstraction();
int textureUnit = -1;
TestGlAbstraction& gl = application.GetGlAbstraction();
int textureUnit = -1;
DALI_TEST_CHECK( controlRenderer );
Actor actor = Actor::New();
DALI_TEST_CHECK( controlRenderer );
Actor actor = Actor::New();
//The testkit still has to load a bitmap for the broken renderer image
//The testkit still has to load a bitmap for the broken renderer image
+ Integration::Bitmap* bitmap = Integration::Bitmap::New(Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD);
+ bitmap->GetPackedPixelsProfile()->ReserveBuffer( Pixel::RGBA8888, 100, 100, 100, 100 );
TestControlRendererRender( application, actor, controlRenderer, 1u,
ImageDimensions(),
TestControlRendererRender( application, actor, controlRenderer, 1u,
ImageDimensions(),
- Integration::ResourcePointer(Integration::Bitmap::New(Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD)) );
+ Integration::ResourcePointer(bitmap) );
TestGlAbstraction& gl = application.GetGlAbstraction();
int textureUnit = -1;
TestGlAbstraction& gl = application.GetGlAbstraction();
int textureUnit = -1;