From 94974c285d90246b4e59db9f8115d23f1ca5246a Mon Sep 17 00:00:00 2001
From: David Steele <david.steele@samsung.com>
Date: Fri, 30 Apr 2021 14:49:28 +0100
Subject: [PATCH] Adding source format to texture upload

Change-Id: I8f057c041435a9e05bd450a98b0988c577d48d19
---
 dali/graphics-api/graphics-types.h                | 31 ++++++++++++-----------
 dali/internal/render/renderers/render-texture.cpp |  1 +
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/dali/graphics-api/graphics-types.h b/dali/graphics-api/graphics-types.h
index f32bffb..31b358e 100644
--- a/dali/graphics-api/graphics-types.h
+++ b/dali/graphics-api/graphics-types.h
@@ -925,6 +925,7 @@ struct TextureUpdateInfo
   Extent2D srcExtent2D{};
   uint32_t srcOffset{};
   uint32_t srcSize{};
+  Format   srcFormat{}; ///< Should match dstTexture's format, otherwise conversion may occur
 };
 
 /**
@@ -1307,8 +1308,8 @@ enum class GraphicsStructureType : uint32_t
  */
 enum class AttachmentLoadOp
 {
-  LOAD, ///< Load previous content
-  CLEAR, ///< Clear the attachment
+  LOAD,     ///< Load previous content
+  CLEAR,    ///< Clear the attachment
   DONT_CARE ///< Let driver decide
 };
 
@@ -1318,7 +1319,7 @@ enum class AttachmentLoadOp
  */
 enum class AttachmentStoreOp
 {
-  STORE, ///< Store content (color attachemnts)
+  STORE,    ///< Store content (color attachemnts)
   DONT_CARE ///< Let driver decide (depth/stencil attachemnt with no intention of reading)
 };
 
@@ -1343,7 +1344,7 @@ struct AttachmentDescription
    * @param value Load operation
    * @return this structure
    */
-  auto& SetLoadOp( AttachmentLoadOp value )
+  auto& SetLoadOp(AttachmentLoadOp value)
   {
     loadOp = value;
     return *this;
@@ -1355,7 +1356,7 @@ struct AttachmentDescription
    * @param value Store operation
    * @return this structure
    */
-  auto& SetStoreOp( AttachmentStoreOp value )
+  auto& SetStoreOp(AttachmentStoreOp value)
   {
     storeOp = value;
     return *this;
@@ -1367,7 +1368,7 @@ struct AttachmentDescription
    * @param value load operation
    * @return this structure
    */
-  auto& SetStencilLoadOp( AttachmentLoadOp value )
+  auto& SetStencilLoadOp(AttachmentLoadOp value)
   {
     stencilLoadOp = value;
     return *this;
@@ -1379,15 +1380,15 @@ struct AttachmentDescription
    * @param value store operation
    * @return this structure
    */
-  auto& SetStencilStoreOp( AttachmentStoreOp value )
+  auto& SetStencilStoreOp(AttachmentStoreOp value)
   {
     stencilStoreOp = value;
     return *this;
   }
 
-  AttachmentLoadOp loadOp{};
+  AttachmentLoadOp  loadOp{};
   AttachmentStoreOp storeOp{};
-  AttachmentLoadOp stencilLoadOp{};
+  AttachmentLoadOp  stencilLoadOp{};
   AttachmentStoreOp stencilStoreOp{};
 };
 
@@ -1495,12 +1496,12 @@ using Surface = void;
  */
 enum class RenderTargetTransformFlagBits
 {
-  TRANSFORM_IDENTITY_BIT = 0x00000001,
-  ROTATE_90_BIT = 0x00000002,
-  ROTATE_180_BIT = 0x00000004,
-  ROTATE_270_BIT = 0x00000008,
-  HORIZONTAL_MIRROR_BIT = 0x00000010,
-  HORIZONTAL_MIRROR_ROTATE_90_BIT = 0x00000020,
+  TRANSFORM_IDENTITY_BIT           = 0x00000001,
+  ROTATE_90_BIT                    = 0x00000002,
+  ROTATE_180_BIT                   = 0x00000004,
+  ROTATE_270_BIT                   = 0x00000008,
+  HORIZONTAL_MIRROR_BIT            = 0x00000010,
+  HORIZONTAL_MIRROR_ROTATE_90_BIT  = 0x00000020,
   HORIZONTAL_MIRROR_ROTATE_180_BIT = 0x00000040,
   HORIZONTAL_MIRROR_ROTATE_270_BIT = 0x00000080,
 };
diff --git a/dali/internal/render/renderers/render-texture.cpp b/dali/internal/render/renderers/render-texture.cpp
index 013a380..5d7a53f 100644
--- a/dali/internal/render/renderers/render-texture.cpp
+++ b/dali/internal/render/renderers/render-texture.cpp
@@ -289,6 +289,7 @@ void Texture::Upload(PixelDataPtr pixelData, const Internal::Texture::UploadPara
   info.srcExtent2D  = {params.width, params.height};
   info.srcOffset    = 0;
   info.srcSize      = pixelData->GetBufferSize();
+  info.srcFormat    = ConvertPixelFormat(pixelData->GetPixelFormat());
 
   Graphics::TextureUpdateSourceInfo updateSourceInfo{};
   updateSourceInfo.sourceType          = Graphics::TextureUpdateSourceInfo::Type::MEMORY;
-- 
2.7.4