From: Seungho, Baek <sbsh.baek@samsung.com>
Date: Thu, 16 Apr 2020 03:47:47 +0000 (+0900)
Subject: [Tizen] Add Pixel format for depth and stencil
X-Git-Tag: accepted/tizen/5.5/unified/20200507.152328~1
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=f7a3d13b9c34600783e75b7021c1484342b39c5a

[Tizen] Add Pixel format for depth and stencil

 - add cases on the switch to control pixel enum

Change-Id: Ib9c88d92926263e24fbd18c9bbed17ee76559a71
Signed-off-by: Seungho, Baek <sbsh.baek@samsung.com>
---

diff --git a/build/tizen/docs/dali.doxy.in b/build/tizen/docs/dali.doxy.in
index d7e0000..7f304a8 100644
--- a/build/tizen/docs/dali.doxy.in
+++ b/build/tizen/docs/dali.doxy.in
@@ -355,6 +355,7 @@ ALIASES += SINCE_1_1="@since 1.1"
 ALIASES += SINCE_1_2="@since 1.2"
 ALIASES += SINCE_1_3="@since 1.3"
 ALIASES += SINCE_1_4="@since 1.4"
+ALIASES += SINCE_1_5="@since 1.5"
 
 # Extra tags for Tizen 3.0
 ALIASES += SINCE_1_2_2="@since 1.2.2"
@@ -372,6 +373,7 @@ ALIASES += SINCE_1_3_15="@since 1.3.15"
 
 #Extra tags for Tizen 5.5
 ALIASES += SINCE_1_3_31="@since 1.3.31"
+ALIASES += SINCE_1_5_9="@since 1.5.9"
 
 ALIASES += DEPRECATED_1_0="@deprecated Deprecated since 1.0"
 ALIASES += DEPRECATED_1_1="@deprecated Deprecated since 1.1"
@@ -400,6 +402,7 @@ ALIASES += REMARK_RAWVIDEO=""
 #ALIASES += SINCE_1_2="\par Since:\n 4.0, DALi version 1.2"
 #ALIASES += SINCE_1_3="\par Since:\n 5.0, DALi version 1.3"
 #ALIASES += SINCE_1_4="\par Since:\n 5.5, DALi version 1.4"
+#ALIASES += SINCE_1_5="\par Since:\n 6.0, DALi version 1.5"
 
 ## Extra tags for Tizen 3.0
 #ALIASES += SINCE_1_2_2="\par Since:\n 3.0, DALi version 1.2.2"
@@ -417,6 +420,7 @@ ALIASES += REMARK_RAWVIDEO=""
 
 #Extra tags for Tizen 5.5
 #ALIASES += SINCE_1_3_31="\par Since:\n 5.5, DALi version 1.3.31"
+#ALIASES += SINCE_1_5_9="\par Since:\n 5.5, DALi version 1.5.9"
 
 ## DALi has no deprecated API in Tizen 2.4 because it's DALi's first release.
 ## Thus deprecated APIs in DALi 1.0.xx will be deprecated in Tizen 3.0.
diff --git a/dali-toolkit/internal/visuals/npatch-loader.cpp b/dali-toolkit/internal/visuals/npatch-loader.cpp
index e89ebcb..1bc1ce4 100644
--- a/dali-toolkit/internal/visuals/npatch-loader.cpp
+++ b/dali-toolkit/internal/visuals/npatch-loader.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.
@@ -148,6 +148,9 @@ void GetRedOffsetAndMask( Dali::Pixel::Format pixelFormat, int& byteOffset, int&
     }
     case Dali::Pixel::RGB16F:
     case Dali::Pixel::RGB32F:
+    case Dali::Pixel::DEPTH_UNSIGNED_INT:
+    case Dali::Pixel::DEPTH_FLOAT:
+    case Dali::Pixel::DEPTH_STENCIL:
     {
       DALI_LOG_ERROR("Pixel format not compatible.\n");
       byteOffset=0;