-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
// CLASS HEADER
#include <dali/public-api/images/pixel.h>
case COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2:
case COMPRESSED_RGBA8_ETC2_EAC:
case COMPRESSED_SRGB8_ALPHA8_ETC2_EAC:
+ case COMPRESSED_RGBA_ASTC_4x4_KHR:
+ case COMPRESSED_RGBA_ASTC_5x4_KHR:
+ case COMPRESSED_RGBA_ASTC_5x5_KHR:
+ case COMPRESSED_RGBA_ASTC_6x5_KHR:
+ case COMPRESSED_RGBA_ASTC_6x6_KHR:
+ case COMPRESSED_RGBA_ASTC_8x5_KHR:
+ case COMPRESSED_RGBA_ASTC_8x6_KHR:
+ case COMPRESSED_RGBA_ASTC_8x8_KHR:
+ case COMPRESSED_RGBA_ASTC_10x5_KHR:
+ case COMPRESSED_RGBA_ASTC_10x6_KHR:
+ case COMPRESSED_RGBA_ASTC_10x8_KHR:
+ case COMPRESSED_RGBA_ASTC_10x10_KHR:
+ case COMPRESSED_RGBA_ASTC_12x10_KHR:
+ case COMPRESSED_RGBA_ASTC_12x12_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR:
{
return true;
}
case COMPRESSED_SRGB8_ETC2:
case COMPRESSED_RGB8_ETC1:
case COMPRESSED_RGB_PVRTC_4BPPV1:
+ case RGB16F:
+ case RGB32F:
+ case INVALID:
{
return false;
}
return false;
}
-unsigned int Pixel::GetBytesPerPixel(Format pixelFormat)
+uint32_t Pixel::GetBytesPerPixel(Format pixelFormat)
{
switch (pixelFormat)
{
return 4;
}
+ case RGB16F:
+ {
+ return 12;
+ }
+
+ case RGB32F:
+ {
+ return 24;
+ }
+
case COMPRESSED_R11_EAC:
case COMPRESSED_SIGNED_R11_EAC:
case COMPRESSED_RG11_EAC:
case COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2:
case COMPRESSED_RGBA8_ETC2_EAC:
case COMPRESSED_SRGB8_ALPHA8_ETC2_EAC:
+ case COMPRESSED_RGBA_ASTC_4x4_KHR:
+ case COMPRESSED_RGBA_ASTC_5x4_KHR:
+ case COMPRESSED_RGBA_ASTC_5x5_KHR:
+ case COMPRESSED_RGBA_ASTC_6x5_KHR:
+ case COMPRESSED_RGBA_ASTC_6x6_KHR:
+ case COMPRESSED_RGBA_ASTC_8x5_KHR:
+ case COMPRESSED_RGBA_ASTC_8x6_KHR:
+ case COMPRESSED_RGBA_ASTC_8x8_KHR:
+ case COMPRESSED_RGBA_ASTC_10x5_KHR:
+ case COMPRESSED_RGBA_ASTC_10x6_KHR:
+ case COMPRESSED_RGBA_ASTC_10x8_KHR:
+ case COMPRESSED_RGBA_ASTC_10x10_KHR:
+ case COMPRESSED_RGBA_ASTC_12x10_KHR:
+ case COMPRESSED_RGBA_ASTC_12x12_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR:
+ case INVALID:
{
DALI_LOG_ERROR("Pixel formats for compressed images do not have meaningful integer bits per pixel values.\n");
return 0;
case COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2:
case COMPRESSED_RGBA8_ETC2_EAC:
case COMPRESSED_SRGB8_ALPHA8_ETC2_EAC:
+ case COMPRESSED_RGBA_ASTC_4x4_KHR:
+ case COMPRESSED_RGBA_ASTC_5x4_KHR:
+ case COMPRESSED_RGBA_ASTC_5x5_KHR:
+ case COMPRESSED_RGBA_ASTC_6x5_KHR:
+ case COMPRESSED_RGBA_ASTC_6x6_KHR:
+ case COMPRESSED_RGBA_ASTC_8x5_KHR:
+ case COMPRESSED_RGBA_ASTC_8x6_KHR:
+ case COMPRESSED_RGBA_ASTC_8x8_KHR:
+ case COMPRESSED_RGBA_ASTC_10x5_KHR:
+ case COMPRESSED_RGBA_ASTC_10x6_KHR:
+ case COMPRESSED_RGBA_ASTC_10x8_KHR:
+ case COMPRESSED_RGBA_ASTC_10x10_KHR:
+ case COMPRESSED_RGBA_ASTC_12x10_KHR:
+ case COMPRESSED_RGBA_ASTC_12x12_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR:
+ case COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR:
+ case RGB16F:
+ case RGB32F:
+ case INVALID:
{
DALI_LOG_ERROR("Pixel formats for compressed images are not compatible with simple masking-out of per-pixel alpha.\n");
byteOffset=0;