Merge branch 'devel/master' into tizen

[platform/core/uifw/dali-core.git] / dali / public-api / images / pixel.h

diff --git a/dali/public-api/images/pixel.h b/dali/public-api/images/pixel.h
index afd9760..bb80167 100644 (file)
--- a/dali/public-api/images/pixel.h
+++ b/dali/public-api/images/pixel.h
@@ -2,7 +2,7 @@
 #define __DALI_PIXEL_H__
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 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.
@@ -107,6 +107,10 @@ enum Format
   COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR,   ///< ASTC Non-linear (gamma-corrected) color space with a 12x10 block-size. @SINCE_1_1.17
   COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR,   ///< ASTC Non-linear (gamma-corrected) color space with a 12x12 block-size. @SINCE_1_1.17
 
+  // GLES 3.0 floating point formats.
+  RGB16F, ///< Color depth 48-bit, 16-16-16 half floating point. @SINCE_1_2.60
+  RGB32F, ///< Color depth 96-bit, 32-32-32 floating point. @SINCE_1_2.60
+
   ///! Update LAST_VALID_PIXEL_FORMAT below if you add an enum value here.
 };
 
@@ -122,7 +126,7 @@ const Format FIRST_VALID_PIXEL_FORMAT = A8;
  *
  * Sync it to the last value above.
  */
-const Format LAST_VALID_PIXEL_FORMAT = COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR;
+const Format LAST_VALID_PIXEL_FORMAT = RGB32F;
 
 /**
  * @brief Whether specified pixel format contains an alpha value.
@@ -131,7 +135,7 @@ const Format LAST_VALID_PIXEL_FORMAT = COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR;
  * @param[in] pixelformat Pixel format
  * @return @c true if format has alpha, @c false otherwise
  */
-DALI_IMPORT_API bool HasAlpha(Format pixelformat);
+DALI_CORE_API bool HasAlpha(Format pixelformat);
 
 /**
  * @brief Returns The number of bytes per pixel for the specified pixel format.
@@ -140,7 +144,7 @@ DALI_IMPORT_API bool HasAlpha(Format pixelformat);
  * @param[in] pixelFormat The pixel format
  * @return The number of bytes per pixel
  */
-DALI_IMPORT_API unsigned int GetBytesPerPixel(Format pixelFormat);
+DALI_CORE_API unsigned int GetBytesPerPixel(Format pixelFormat);
 
 /**
  * @brief Returns the offset of the byte containing the alpha value from the start of the pixel data
@@ -156,7 +160,7 @@ DALI_IMPORT_API unsigned int GetBytesPerPixel(Format pixelFormat);
  * @param[out] bitMask The bitmask of the byte to get the alpha value
  *
  */
-DALI_IMPORT_API void GetAlphaOffsetAndMask(Format pixelFormat, int& byteOffset, int& bitMask);
+DALI_CORE_API void GetAlphaOffsetAndMask(Format pixelFormat, int& byteOffset, int& bitMask);
 
 } //namespace Pixel