/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
// CLASS HEADER
#include <dali/internal/render/gl-resources/bitmap-texture.h>
+// EXTERNAL INCLUDES
+#include <cstring>
+
// INTERNAL INCLUDES
+#include <dali/public-api/common/dali-vector.h>
+#include <dali/public-api/images/buffer-image.h> // For PixelBuffer
#include <dali/integration-api/debug.h>
-#include <dali/internal/render/common/vertex.h>
#include <dali/internal/render/common/performance-monitor.h>
#include <dali/internal/render/gl-resources/context.h>
#include <dali/internal/render/gl-resources/texture-units.h>
+
namespace Dali
{
bitmap->GetImageWidth(),
bitmap->GetImageHeight()),
mBitmap(bitmap),
- mClearPixels(false),
+ mPixelFormat(bitmap->GetPixelFormat()),
mDiscardPolicy(policy),
- mPixelFormat(bitmap->GetPixelFormat())
+ mClearPixels(false)
{
DALI_LOG_TRACE_METHOD(Debug::Filter::gImage);
DALI_LOG_SET_OBJECT_STRING(this, DALI_LOG_GET_OBJECT_STRING(bitmap));
width, height,
width, height),
mBitmap(NULL),
- mClearPixels(clearPixels),
+ mPixelFormat( pixelFormat ),
mDiscardPolicy(policy),
- mPixelFormat( pixelFormat )
+ mClearPixels(clearPixels)
{
DALI_LOG_TRACE_METHOD(Debug::Filter::gImage);
}
updateArea.x, updateArea.y, updateArea.width ,updateArea.height );
const unsigned int pitchPixels = mWidth;
- const unsigned int pixelDepth = GetBytesPerPixel( mPixelFormat );
+ const unsigned int pixelDepth = Dali::Pixel::GetBytesPerPixel( mPixelFormat );
// If the width of the source update area is the same as the pitch, then can
// copy the contents in a single contiguous TexSubImage call.
mContext.TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
mContext.TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- INCREASE_BY( PerformanceMonitor::TEXTURE_DATA_UPLOADED, GetBytesPerPixel(mPixelFormat) * mWidth * mHeight );
+ // If the resource policy is to discard on upload then release buffer
+ DiscardBitmapBuffer();
+
+ if( pixels != NULL )
+ {
+ INCREASE_BY( PerformanceMonitor::TEXTURE_DATA_UPLOADED, GetBytesPerPixel(mPixelFormat) * mWidth * mHeight );
+ }
}
void BitmapTexture::Update( Integration::Bitmap* bitmap )
DALI_ASSERT_DEBUG( bitmap != 0 );
if( !bitmap )
{
- DALI_LOG_ERROR( "Passed a null bitmap to update this bitmap texture." );
+ DALI_LOG_ERROR( "Passed a null bitmap to update this bitmap texture.\n" );
return;
}
if( !bitmapPackedPixels )
{
///! This should never happen.
- DALI_LOG_ERROR("Passed an incompatible bitmap type to update this bitmap texture.");
+ DALI_LOG_ERROR("Passed an incompatible bitmap type to update this bitmap texture.\n");
return;
}
mBitmap = bitmap;
{
if( NULL != srcBitmap )
{
- GLenum pixelFormat = GL_RGBA;
- GLenum pixelDataType = GL_UNSIGNED_BYTE;
- Integration::ConvertToGlFormat( mPixelFormat, pixelDataType, pixelFormat );
+ Update( srcBitmap->GetBuffer(), srcBitmap->GetImageWidth(), srcBitmap->GetImageHeight(),
+ srcBitmap->GetPixelFormat(), xOffset, yOffset);
+ }
+}
- if( !mId )
- {
- mContext.GenTextures( 1, &mId );
+void BitmapTexture::Update( PixelData* srcPixelData, std::size_t xOffset, std::size_t yOffset )
+{
+ if( NULL != srcPixelData )
+ {
+ Update( srcPixelData->GetBuffer(), srcPixelData->GetWidth(), srcPixelData->GetHeight(),
+ srcPixelData->GetPixelFormat(), xOffset, yOffset);
+ }
+}
+
+void BitmapTexture::Update( const unsigned char* pixels, std::size_t width, std::size_t height, Pixel::Format pixelFormat, std::size_t xOffset, std::size_t yOffset )
+{
- mContext.ActiveTexture( TEXTURE_UNIT_UPLOAD );
- mContext.Bind2dTexture( mId );
- mContext.PixelStorei( GL_UNPACK_ALIGNMENT, 1 );
+ GLenum pixelGLFormat = GL_RGBA;
+ GLenum pixelDataType = GL_UNSIGNED_BYTE;
+ Integration::ConvertToGlFormat( mPixelFormat, pixelDataType, pixelGLFormat );
- mContext.TexImage2D( GL_TEXTURE_2D, 0, pixelFormat, mWidth, mHeight, 0, pixelFormat, pixelDataType, NULL );
- mContext.TexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE );
- mContext.TexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE );
- }
- else
+ if( !mId )
+ {
+ mContext.GenTextures( 1, &mId );
+
+ mContext.ActiveTexture( TEXTURE_UNIT_UPLOAD );
+ mContext.Bind2dTexture( mId );
+ mContext.PixelStorei( GL_UNPACK_ALIGNMENT, 1 );
+
+ mContext.TexImage2D( GL_TEXTURE_2D, 0, pixelGLFormat, mWidth, mHeight, 0, pixelGLFormat, pixelDataType, NULL );
+ mContext.TexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE );
+ mContext.TexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE );
+ }
+ else
+ {
+ mContext.ActiveTexture( TEXTURE_UNIT_UPLOAD );
+ mContext.Bind2dTexture( mId );
+ mContext.PixelStorei( GL_UNPACK_ALIGNMENT, 1 );
+ }
+
+#if DALI_GLES_VERSION >= 30
+ // For GLES 3.0, uploading sub-image with different format is a valid operation.
+ Integration::ConvertToGlFormat( pixelFormat, pixelDataType, pixelGLFormat );
+#else
+ // Allows RGB888 source bitmap to be added to RGBA8888 texture, need to convert the bitmap format manually.
+ if(pixelFormat == Pixel::RGB888 && mPixelFormat == Pixel::RGBA8888 )
+ {
+ std::size_t size = width * height;
+
+ Vector<PixelBuffer> tempBuffer;
+ tempBuffer.Reserve( size*4u );
+ PixelBuffer* data = tempBuffer.Begin();
+
+ for( std::size_t i=0u; i<size; i++ )
{
- mContext.ActiveTexture( TEXTURE_UNIT_UPLOAD );
- mContext.Bind2dTexture( mId );
- mContext.PixelStorei( GL_UNPACK_ALIGNMENT, 1 );
+ data[i*4u] = pixels[i*3u];
+ data[i*4u+1] = pixels[i*3u+1];
+ data[i*4u+2] = pixels[i*3u+2];
+ data[i*4u+3] = 0xFF;
}
mContext.TexSubImage2D( GL_TEXTURE_2D, 0,
xOffset, yOffset,
- srcBitmap->GetImageWidth(), srcBitmap->GetImageHeight(),
- pixelFormat, pixelDataType, srcBitmap->GetBuffer() );
+ width, height,
+ pixelGLFormat, pixelDataType,
+ data );
+
+ return;
}
+#endif
+
+ mContext.TexSubImage2D( GL_TEXTURE_2D, 0,
+ xOffset, yOffset,
+ width, height,
+ pixelGLFormat, pixelDataType,
+ pixels );
}
void BitmapTexture::UpdateArea( const RectArea& updateArea )
else
{
const unsigned char* pixels = NULL;
- std::vector<unsigned char> pixelData;
- if( ( NULL == pixels ) && ( true == mClearPixels ) )
+ Dali::Vector<unsigned char> pixelData; // Okay to create outside branch as empty vector has no heap allocation.
+ if( true == mClearPixels )
{
- unsigned int size = mWidth * mHeight * Pixel::GetBytesPerPixel(mPixelFormat);
- pixelData.resize(size, 0);
+ unsigned int size = mWidth * mHeight * Pixel::GetBytesPerPixel( mPixelFormat );
+ pixelData.Resize( size, 0 );
pixels = &pixelData[0];
}
AssignBitmap( true, pixels );
void BitmapTexture::DiscardBitmapBuffer()
{
- DALI_LOG_INFO(Debug::Filter::gImage, Debug::General, "BitmapTexture::DiscardBitmapBuffer() DiscardPolicy: %s\n", mDiscardPolicy == ResourcePolicy::DISCARD?"DISCARD":"RETAIN");
+ DALI_LOG_INFO(Debug::Filter::gImage, Debug::General, "BitmapTexture::DiscardBitmapBuffer() DiscardPolicy: %s\n", mDiscardPolicy == ResourcePolicy::OWNED_DISCARD?"DISCARD":"RETAIN");
- if( ResourcePolicy::DISCARD == mDiscardPolicy )
+ if( ResourcePolicy::OWNED_DISCARD == mDiscardPolicy )
{
DALI_LOG_INFO(Debug::Filter::gImage, Debug::General, " Discarding bitmap\n");
- mBitmap->DiscardBuffer();
+ if ( mBitmap )
+ {
+ mBitmap->DiscardBuffer();
+ }
}
}
projects / platform / core / uifw / dali-core.git / blobdiff