[dali_1.1.33] Merge branch 'devel/master'

[platform/core/uifw/dali-core.git] / dali / internal / render / gl-resources / compressed-bitmap-texture.h

diff --git a/dali/internal/render/gl-resources/compressed-bitmap-texture.h b/dali/internal/render/gl-resources/compressed-bitmap-texture.h
index 45f124b..035abb4 100644 (file)
--- a/dali/internal/render/gl-resources/compressed-bitmap-texture.h
+++ b/dali/internal/render/gl-resources/compressed-bitmap-texture.h
@@ -23,10 +23,10 @@
 #include <stdint.h>
 
 // INTERNAL INCLUDES
-#include <dali/public-api/images/bitmap-image.h>
+#include <dali/public-api/images/buffer-image.h>
 #include <dali/internal/common/message.h>
 #include <dali/internal/render/gl-resources/texture.h>
-#include <dali/internal/common/bitmap-upload.h>
+#include <dali/internal/render/gl-resources/texture-cache.h>
 #include <dali/integration-api/bitmap.h>
 #include <dali/internal/event/images/bitmap-compressed.h>
 #include <dali/integration-api/debug.h>
@@ -55,9 +55,10 @@ public:
    * Constructor
    * Creates a new texture object from a Bitmap
    * @param[in] bitmap The Bitmap
-   * @param     context The GL context
+   * @param[in] context The GL context
+   * @param[in] discardPolicy The discard policy
    */
-  CompressedBitmapTexture( Internal::BitmapCompressed* const bitmap, Context& context );
+  CompressedBitmapTexture( Internal::BitmapCompressed* const bitmap, Context& context, ResourcePolicy::Discardable discardPolicy );
 
   /**
    * Destructor.
@@ -121,6 +122,7 @@ private:
 
 private:
   Internal::BitmapCompressedPtr mBitmap;      ///< The Bitmap the Texture was created from (may be NULL)
+  Pixel::Format  mPixelFormat;
 
   // Changes scope, should be at end of class
   DALI_LOG_OBJECT_STRING_DECLARATION;