From 9a0f3f2da4e191a6d8784c38159f9bd3181d7c3e Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Wed, 17 Jun 2020 22:44:58 +0100 Subject: [PATCH] Image class Usage Removal Change-Id: I17acf67f1f66cc36e2e5b35e64686a12830b0e9a --- .../dali-test-suite-utils.cpp | 15 ---------- .../dali-test-suite-utils.h | 3 -- .../dali-toolkit-test-utils/mesh-builder.cpp | 10 ------- .../dali-toolkit-test-utils/mesh-builder.h | 1 - .../dali-toolkit-test-utils/test-actor-utils.cpp | 35 ---------------------- .../dali-toolkit-test-utils/test-actor-utils.h | 16 ---------- .../internal/visuals/image-atlas-manager.cpp | 3 +- .../internal/visuals/image/image-visual.cpp | 1 - .../internal/visuals/npatch/npatch-visual.cpp | 1 - .../internal/visuals/texture-manager-impl.cpp | 1 - 10 files changed, 1 insertion(+), 85 deletions(-) diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp index d76ce60..b494a98 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp @@ -328,21 +328,6 @@ void ConstraintAppliedCheck::CheckSignalNotReceived() } } -void PrepareResourceImage( TestApplication& application, uint32_t imageWidth, uint32_t imageHeight, Pixel::Format pixelFormat ) -{ - TestPlatformAbstraction& platform = application.GetPlatform(); - platform.SetClosestImageSize(Vector2( imageWidth, imageHeight)); - - Integration::Bitmap* bitmap = Integration::Bitmap::New( Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_RETAIN ); - Integration::PixelBuffer* pixbuffer = bitmap->GetPackedPixelsProfile()->ReserveBuffer( pixelFormat, imageWidth, imageHeight, imageWidth, imageHeight ); - uint32_t bytesPerPixel = GetBytesPerPixel( pixelFormat ); - uint32_t initialColor = 0xFF; - memset( pixbuffer, initialColor, imageHeight*imageWidth*bytesPerPixel); - - Integration::ResourcePointer resourcePtr(bitmap); - platform.SetSynchronouslyLoadedResource( resourcePtr ); -} - namespace Test { diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h index 94ef86a..1635ef8 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h @@ -393,9 +393,6 @@ struct DefaultFunctionCoverage } }; -// Prepare a resource image to be loaded. Should be called before creating the ResourceImage -void PrepareResourceImage( TestApplication& application, uint32_t imageWidth, uint32_t imageHeight, Pixel::Format pixelFormat ); - // Test namespace to prevent pollution of Dali namespace, add Test helper functions here namespace Test { diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.cpp index f8e3917..2e8f724 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.cpp @@ -18,9 +18,6 @@ // CLASS HEADER #include "mesh-builder.h" -// EXTERNAL INCLUDES -#include - namespace Dali { @@ -34,13 +31,6 @@ TextureSet CreateTextureSet() return TextureSet::New(); } -TextureSet CreateTextureSet( Image image ) -{ - TextureSet textureSet = TextureSet::New(); - TextureSetImage( textureSet, 0u, image ); - return textureSet; -} - TextureSet CreateTextureSet( Texture texture ) { TextureSet textureSet = TextureSet::New(); diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.h index ea0b156..37d13ec 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.h @@ -26,7 +26,6 @@ namespace Dali Shader CreateShader(); TextureSet CreateTextureSet(); -TextureSet CreateTextureSet( Image image ); TextureSet CreateTextureSet( Texture texture ); Geometry CreateQuadGeometry(); PropertyBuffer CreatePropertyBuffer(); diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp index 32bccdd..5d45a12 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp @@ -20,7 +20,6 @@ // EXTERNAL INCLUDES #include -#include // INTERNAL INCLUDES #include "mesh-builder.h" @@ -94,38 +93,4 @@ Actor CreateRenderableActor( Texture texture, const std::string& vertexShader, c return actor; } -Actor CreateRenderableActor( Image texture ) -{ - return CreateRenderableActor( texture, VERTEX_SHADER, FRAGMENT_SHADER ); -} - -Actor CreateRenderableActor( Image texture, const std::string& vertexShader, const std::string& fragmentShader ) -{ - // Create the geometry - Geometry geometry = CreateQuadGeometry(); - - // Create Shader - Shader shader = Shader::New( vertexShader, fragmentShader ); - - // Create renderer from geometry and material - Renderer renderer = Renderer::New( geometry, shader ); - - // Create actor and set renderer - Actor actor = Actor::New(); - actor.AddRenderer( renderer ); - - // If we a texture, then create a texture-set and add to renderer - if( texture ) - { - TextureSet textureSet = TextureSet::New(); - TextureSetImage( textureSet, 0u, texture ); - renderer.SetTextures( textureSet ); - - // Set actor to the size of the texture if set - actor.SetProperty( Actor::Property::SIZE, Vector2( texture.GetWidth(), texture.GetHeight() ) ); - } - - return actor; -} - } // namespace Dali diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.h index 8b8859f..4a8716e 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.h @@ -39,22 +39,6 @@ Actor CreateRenderableActor(); * @param[in] texture Texture to set. * @return An actor with a renderer. */ -Actor CreateRenderableActor( Image texture ); - -/** - * @brief Creates a renderable-actor with a texture and custom shaders. - * @param[in] texture Texture to set. - * @param[in] vertexShader The vertex-shader. - * @param[in] fragmentShader The fragment-shader. - * @return An actor with a renderer. - */ -Actor CreateRenderableActor( Image texture, const std::string& vertexShader, const std::string& fragmentShader ); - -/** - * @brief Creates a renderable-actor with a texture. - * @param[in] texture Texture to set. - * @return An actor with a renderer. - */ Actor CreateRenderableActor( Texture texture ); /** diff --git a/dali-toolkit/internal/visuals/image-atlas-manager.cpp b/dali-toolkit/internal/visuals/image-atlas-manager.cpp index 2e4dfb4..a9a4786 100644 --- a/dali-toolkit/internal/visuals/image-atlas-manager.cpp +++ b/dali-toolkit/internal/visuals/image-atlas-manager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -19,7 +19,6 @@ #include "image-atlas-manager.h" // EXTERNAL HEADER -#include #include namespace Dali diff --git a/dali-toolkit/internal/visuals/image/image-visual.cpp b/dali-toolkit/internal/visuals/image/image-visual.cpp index 7e196fa..9823a92 100644 --- a/dali-toolkit/internal/visuals/image/image-visual.cpp +++ b/dali-toolkit/internal/visuals/image/image-visual.cpp @@ -22,7 +22,6 @@ #include // for strlen() #include #include -#include #include #include #include diff --git a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp index 020f20a..57b1293 100644 --- a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp +++ b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp @@ -20,7 +20,6 @@ // EXTERNAL INCLUDES #include -#include #include #include diff --git a/dali-toolkit/internal/visuals/texture-manager-impl.cpp b/dali-toolkit/internal/visuals/texture-manager-impl.cpp index 8912c17..0af86b3 100644 --- a/dali-toolkit/internal/visuals/texture-manager-impl.cpp +++ b/dali-toolkit/internal/visuals/texture-manager-impl.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #include #include -- 2.7.4