Perform AABB test in the viewport space for renderers when not processing a 3D layer

[platform/core/uifw/dali-core.git] / dali / integration-api / bitmap.cpp

diff --git a/dali/integration-api/bitmap.cpp b/dali/integration-api/bitmap.cpp
index dbebee5..4491800 100644 (file)
--- a/dali/integration-api/bitmap.cpp
+++ b/dali/integration-api/bitmap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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.
@@ -36,7 +36,7 @@ using namespace Dali::Pixel;
 void ConvertToGlFormat(Format pixelformat, unsigned& pixelDataType, unsigned& internalFormat)
 {
   // Compressed textures have no pixelDataType, so init to an invalid value:
-  pixelDataType = -1;
+  pixelDataType = GL_INVALID_VALUE;
 
   switch(pixelformat)
   {
@@ -422,6 +422,13 @@ void ConvertToGlFormat(Format pixelformat, unsigned& pixelDataType, unsigned& in
       internalFormat = GL_RGB;
       break;
     }
+    case R11G11B10F:
+    {
+      DALI_LOG_INFO(Debug::Filter::gImage, Debug::Verbose, "Using GLES 3.0 GLES 3.0 floating point format.\n");
+      pixelDataType  = GL_FLOAT;
+      internalFormat = GL_R11F_G11F_B10F;
+      break;
+    }
 
     // GLES 3.0 depth and stencil formats
     case Pixel::DEPTH_UNSIGNED_INT: