3700cc26a5
The idea is that CoglPixelBuffer should just be a buffer that can be used for pixel data and it has no idea about the details of any images that are stored in it. This is analogous to CoglAttributeBuffer which itself does not have any information about the attributes. When you want to use a pixel buffer you should create a CoglBitmap which points to a region of the attribute buffer and provides the extra needed information such as the width, height and format. That way it is also possible to use a single CoglPixelBuffer with multiple bitmaps. The changes that are made are: • cogl_pixel_buffer_new_with_size has been removed and in its place is cogl_bitmap_new_with_size. This will create a pixel buffer at the right size and rowstride for the given width/height/format and immediately create a single CoglBitmap to point into it. The old function had an out-parameter for the stride of the image but with the new API this should be queriable from the bitmap (although there is no function for this yet). • There is now a public cogl_pixel_buffer_new constructor. This takes a size in bytes and data pointer similarly to cogl_attribute_buffer_new. • cogl_texture_new_from_buffer has been removed. If you want to create a texture from a pixel buffer you should wrap it up in a bitmap first. There is already API to create a texture from a bitmap. This patch also does a bit of header juggling because cogl-context.h was including cogl-texture.h and cogl-framebuffer.h which were causing some circular dependencies when cogl-bitmap.h includes cogl-context.h. These weren't actually needed in cogl-context.h itself but a few other headers were relying on them being included so this adds the #includes where necessary. Reviewed-by: Robert Bragg <robert@linux.intel.com>
452 lines
12 KiB
C
452 lines
12 KiB
C
/*
|
|
* Cogl
|
|
*
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
|
*
|
|
* Copyright (C) 2007,2008,2009 Intel Corporation.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
*
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include "cogl-util.h"
|
|
#include "cogl-debug.h"
|
|
#include "cogl-private.h"
|
|
#include "cogl-bitmap-private.h"
|
|
#include "cogl-buffer-private.h"
|
|
#include "cogl-pixel-buffer.h"
|
|
|
|
#include <string.h>
|
|
|
|
struct _CoglBitmap
|
|
{
|
|
CoglHandleObject _parent;
|
|
CoglPixelFormat format;
|
|
int width;
|
|
int height;
|
|
int rowstride;
|
|
|
|
guint8 *data;
|
|
CoglBitmapDestroyNotify destroy_fn;
|
|
void *destroy_fn_data;
|
|
|
|
gboolean mapped;
|
|
gboolean bound;
|
|
|
|
/* If this is non-null then 'data' is ignored and instead it is
|
|
fetched from this shared bitmap. */
|
|
CoglBitmap *shared_bmp;
|
|
|
|
/* If this is non-null then 'data' is treated as an offset into the
|
|
buffer and map will divert to mapping the buffer */
|
|
CoglBuffer *buffer;
|
|
};
|
|
|
|
static void _cogl_bitmap_free (CoglBitmap *bmp);
|
|
|
|
COGL_OBJECT_DEFINE (Bitmap, bitmap);
|
|
|
|
static void
|
|
_cogl_bitmap_free (CoglBitmap *bmp)
|
|
{
|
|
g_assert (!bmp->mapped);
|
|
g_assert (!bmp->bound);
|
|
|
|
if (bmp->destroy_fn)
|
|
bmp->destroy_fn (bmp->data, bmp->destroy_fn_data);
|
|
|
|
if (bmp->shared_bmp)
|
|
cogl_object_unref (bmp->shared_bmp);
|
|
|
|
if (bmp->buffer)
|
|
cogl_object_unref (bmp->buffer);
|
|
|
|
g_slice_free (CoglBitmap, bmp);
|
|
}
|
|
|
|
gboolean
|
|
_cogl_bitmap_convert_premult_status (CoglBitmap *bmp,
|
|
CoglPixelFormat dst_format)
|
|
{
|
|
/* Do we need to unpremultiply? */
|
|
if ((bmp->format & COGL_PREMULT_BIT) > 0 &&
|
|
(dst_format & COGL_PREMULT_BIT) == 0 &&
|
|
COGL_PIXEL_FORMAT_CAN_HAVE_PREMULT (dst_format))
|
|
return _cogl_bitmap_unpremult (bmp);
|
|
|
|
/* Do we need to premultiply? */
|
|
if ((bmp->format & COGL_PREMULT_BIT) == 0 &&
|
|
COGL_PIXEL_FORMAT_CAN_HAVE_PREMULT (bmp->format) &&
|
|
(dst_format & COGL_PREMULT_BIT) > 0)
|
|
/* Try premultiplying using imaging library */
|
|
return _cogl_bitmap_premult (bmp);
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
CoglBitmap *
|
|
_cogl_bitmap_copy (CoglBitmap *src_bmp)
|
|
{
|
|
CoglBitmap *dst_bmp;
|
|
CoglPixelFormat src_format = _cogl_bitmap_get_format (src_bmp);
|
|
int bpp = _cogl_pixel_format_get_bytes_per_pixel (src_format);
|
|
int width = _cogl_bitmap_get_width (src_bmp);
|
|
int height = _cogl_bitmap_get_height (src_bmp);
|
|
int dst_rowstride = width * bpp;
|
|
|
|
/* Round the rowstride up to the next nearest multiple of 4 bytes */
|
|
dst_rowstride = (dst_rowstride + 3) & ~3;
|
|
|
|
dst_bmp = _cogl_bitmap_new_from_data (g_malloc (dst_rowstride * height),
|
|
src_format,
|
|
width, height,
|
|
dst_rowstride,
|
|
(CoglBitmapDestroyNotify) g_free,
|
|
NULL);
|
|
|
|
_cogl_bitmap_copy_subregion (src_bmp,
|
|
dst_bmp,
|
|
0, 0, /* src_x/y */
|
|
0, 0, /* dst_x/y */
|
|
width, height);
|
|
|
|
return dst_bmp;
|
|
}
|
|
|
|
gboolean
|
|
_cogl_bitmap_copy_subregion (CoglBitmap *src,
|
|
CoglBitmap *dst,
|
|
int src_x,
|
|
int src_y,
|
|
int dst_x,
|
|
int dst_y,
|
|
int width,
|
|
int height)
|
|
{
|
|
guint8 *srcdata;
|
|
guint8 *dstdata;
|
|
int bpp;
|
|
int line;
|
|
gboolean succeeded = FALSE;
|
|
|
|
/* Intended only for fast copies when format is equal! */
|
|
g_assert ((src->format & ~COGL_PREMULT_BIT) ==
|
|
(dst->format & ~COGL_PREMULT_BIT));
|
|
|
|
bpp = _cogl_pixel_format_get_bytes_per_pixel (src->format);
|
|
|
|
if ((srcdata = _cogl_bitmap_map (src, COGL_BUFFER_ACCESS_READ, 0)))
|
|
{
|
|
if ((dstdata = _cogl_bitmap_map (dst, COGL_BUFFER_ACCESS_WRITE, 0)))
|
|
{
|
|
srcdata += src_y * src->rowstride + src_x * bpp;
|
|
dstdata += dst_y * dst->rowstride + dst_x * bpp;
|
|
|
|
for (line=0; line<height; ++line)
|
|
{
|
|
memcpy (dstdata, srcdata, width * bpp);
|
|
srcdata += src->rowstride;
|
|
dstdata += dst->rowstride;
|
|
}
|
|
|
|
succeeded = TRUE;
|
|
|
|
_cogl_bitmap_unmap (dst);
|
|
}
|
|
|
|
_cogl_bitmap_unmap (src);
|
|
}
|
|
|
|
return succeeded;
|
|
}
|
|
|
|
gboolean
|
|
cogl_bitmap_get_size_from_file (const char *filename,
|
|
int *width,
|
|
int *height)
|
|
{
|
|
return _cogl_bitmap_get_size_from_file (filename, width, height);
|
|
}
|
|
|
|
CoglBitmap *
|
|
_cogl_bitmap_new_from_data (guint8 *data,
|
|
CoglPixelFormat format,
|
|
int width,
|
|
int height,
|
|
int rowstride,
|
|
CoglBitmapDestroyNotify destroy_fn,
|
|
void *destroy_fn_data)
|
|
{
|
|
CoglBitmap *bmp = g_slice_new (CoglBitmap);
|
|
|
|
bmp->format = format;
|
|
bmp->width = width;
|
|
bmp->height = height;
|
|
bmp->rowstride = rowstride;
|
|
bmp->data = data;
|
|
bmp->destroy_fn = destroy_fn;
|
|
bmp->destroy_fn_data = destroy_fn_data;
|
|
bmp->mapped = FALSE;
|
|
bmp->bound = FALSE;
|
|
bmp->shared_bmp = NULL;
|
|
bmp->buffer = NULL;
|
|
|
|
return _cogl_bitmap_object_new (bmp);
|
|
}
|
|
|
|
CoglBitmap *
|
|
_cogl_bitmap_new_shared (CoglBitmap *shared_bmp,
|
|
CoglPixelFormat format,
|
|
int width,
|
|
int height,
|
|
int rowstride)
|
|
{
|
|
CoglBitmap *bmp = _cogl_bitmap_new_from_data (NULL, /* data */
|
|
format,
|
|
width,
|
|
height,
|
|
rowstride,
|
|
NULL, /* destroy_fn */
|
|
NULL /* destroy_fn_data */);
|
|
|
|
bmp->shared_bmp = cogl_object_ref (shared_bmp);
|
|
|
|
return bmp;
|
|
}
|
|
|
|
CoglBitmap *
|
|
cogl_bitmap_new_from_file (const char *filename,
|
|
GError **error)
|
|
{
|
|
_COGL_RETURN_VAL_IF_FAIL (error == NULL || *error == NULL, COGL_INVALID_HANDLE);
|
|
|
|
return _cogl_bitmap_from_file (filename, error);
|
|
}
|
|
|
|
CoglBitmap *
|
|
cogl_bitmap_new_from_buffer (CoglBuffer *buffer,
|
|
CoglPixelFormat format,
|
|
int width,
|
|
int height,
|
|
int rowstride,
|
|
int offset)
|
|
{
|
|
CoglBitmap *bmp;
|
|
|
|
_COGL_RETURN_VAL_IF_FAIL (cogl_is_buffer (buffer), NULL);
|
|
|
|
bmp = _cogl_bitmap_new_from_data (NULL, /* data */
|
|
format,
|
|
width,
|
|
height,
|
|
rowstride,
|
|
NULL, /* destroy_fn */
|
|
NULL /* destroy_fn_data */);
|
|
|
|
bmp->buffer = cogl_object_ref (buffer);
|
|
bmp->data = GINT_TO_POINTER (offset);
|
|
|
|
return bmp;
|
|
}
|
|
|
|
CoglBitmap *
|
|
cogl_bitmap_new_with_size (CoglContext *context,
|
|
unsigned int width,
|
|
unsigned int height,
|
|
CoglPixelFormat format)
|
|
{
|
|
CoglPixelBuffer *pixel_buffer;
|
|
CoglBitmap *bitmap;
|
|
unsigned int rowstride;
|
|
|
|
/* creating a buffer to store "any" format does not make sense */
|
|
if (G_UNLIKELY (format == COGL_PIXEL_FORMAT_ANY))
|
|
return NULL;
|
|
|
|
/* for now we fallback to cogl_pixel_buffer_new, later, we could ask
|
|
* libdrm a tiled buffer for instance */
|
|
rowstride = width * _cogl_pixel_format_get_bytes_per_pixel (format);
|
|
|
|
pixel_buffer = cogl_pixel_buffer_new (context, height * rowstride, NULL);
|
|
|
|
if (G_UNLIKELY (pixel_buffer == NULL))
|
|
return NULL;
|
|
|
|
bitmap = cogl_bitmap_new_from_buffer (COGL_BUFFER (pixel_buffer),
|
|
format,
|
|
width, height,
|
|
rowstride,
|
|
0 /* offset */);
|
|
|
|
cogl_object_unref (pixel_buffer);
|
|
|
|
return bitmap;
|
|
}
|
|
|
|
CoglPixelFormat
|
|
_cogl_bitmap_get_format (CoglBitmap *bitmap)
|
|
{
|
|
return bitmap->format;
|
|
}
|
|
|
|
void
|
|
_cogl_bitmap_set_format (CoglBitmap *bitmap,
|
|
CoglPixelFormat format)
|
|
{
|
|
bitmap->format = format;
|
|
}
|
|
|
|
int
|
|
_cogl_bitmap_get_width (CoglBitmap *bitmap)
|
|
{
|
|
return bitmap->width;
|
|
}
|
|
|
|
GQuark
|
|
cogl_bitmap_error_quark (void)
|
|
{
|
|
return g_quark_from_static_string ("cogl-bitmap-error-quark");
|
|
}
|
|
|
|
int
|
|
_cogl_bitmap_get_height (CoglBitmap *bitmap)
|
|
{
|
|
return bitmap->height;
|
|
}
|
|
|
|
int
|
|
_cogl_bitmap_get_rowstride (CoglBitmap *bitmap)
|
|
{
|
|
return bitmap->rowstride;
|
|
}
|
|
|
|
guint8 *
|
|
_cogl_bitmap_map (CoglBitmap *bitmap,
|
|
CoglBufferAccess access,
|
|
CoglBufferMapHint hints)
|
|
{
|
|
/* Divert to another bitmap if this data is shared */
|
|
if (bitmap->shared_bmp)
|
|
return _cogl_bitmap_map (bitmap->shared_bmp, access, hints);
|
|
|
|
g_assert (!bitmap->mapped);
|
|
|
|
if (bitmap->buffer)
|
|
{
|
|
guint8 *data = cogl_buffer_map (bitmap->buffer,
|
|
access,
|
|
hints);
|
|
|
|
COGL_NOTE (BITMAP, "A pixel array is being mapped from a bitmap. This "
|
|
"usually means that some conversion on the pixel array is "
|
|
"needed so a sub-optimal format is being used.");
|
|
|
|
if (data)
|
|
{
|
|
bitmap->mapped = TRUE;
|
|
|
|
return data + GPOINTER_TO_INT (bitmap->data);
|
|
}
|
|
else
|
|
return NULL;
|
|
}
|
|
else
|
|
{
|
|
bitmap->mapped = TRUE;
|
|
|
|
return bitmap->data;
|
|
}
|
|
}
|
|
|
|
void
|
|
_cogl_bitmap_unmap (CoglBitmap *bitmap)
|
|
{
|
|
/* Divert to another bitmap if this data is shared */
|
|
if (bitmap->shared_bmp)
|
|
{
|
|
_cogl_bitmap_unmap (bitmap->shared_bmp);
|
|
return;
|
|
}
|
|
|
|
g_assert (bitmap->mapped);
|
|
bitmap->mapped = FALSE;
|
|
|
|
if (bitmap->buffer)
|
|
cogl_buffer_unmap (bitmap->buffer);
|
|
}
|
|
|
|
guint8 *
|
|
_cogl_bitmap_bind (CoglBitmap *bitmap,
|
|
CoglBufferAccess access,
|
|
CoglBufferMapHint hints)
|
|
{
|
|
guint8 *ptr;
|
|
|
|
/* Divert to another bitmap if this data is shared */
|
|
if (bitmap->shared_bmp)
|
|
return _cogl_bitmap_bind (bitmap->shared_bmp, access, hints);
|
|
|
|
g_assert (!bitmap->bound);
|
|
|
|
/* If the bitmap wasn't created from a buffer then the
|
|
implementation of bind is the same as map */
|
|
if (bitmap->buffer == NULL)
|
|
{
|
|
guint8 *data = _cogl_bitmap_map (bitmap, access, hints);
|
|
if (data)
|
|
bitmap->bound = TRUE;
|
|
return data;
|
|
}
|
|
|
|
bitmap->bound = TRUE;
|
|
|
|
if (access == COGL_BUFFER_ACCESS_READ)
|
|
ptr = _cogl_buffer_bind (bitmap->buffer,
|
|
COGL_BUFFER_BIND_TARGET_PIXEL_UNPACK);
|
|
else if (access == COGL_BUFFER_ACCESS_WRITE)
|
|
ptr = _cogl_buffer_bind (bitmap->buffer,
|
|
COGL_BUFFER_BIND_TARGET_PIXEL_PACK);
|
|
else
|
|
g_assert_not_reached ();
|
|
|
|
/* The data pointer actually stores the offset */
|
|
return GPOINTER_TO_INT (bitmap->data) + ptr;
|
|
}
|
|
|
|
void
|
|
_cogl_bitmap_unbind (CoglBitmap *bitmap)
|
|
{
|
|
/* Divert to another bitmap if this data is shared */
|
|
if (bitmap->shared_bmp)
|
|
{
|
|
_cogl_bitmap_unbind (bitmap->shared_bmp);
|
|
return;
|
|
}
|
|
|
|
g_assert (bitmap->bound);
|
|
bitmap->bound = FALSE;
|
|
|
|
/* If the bitmap wasn't created from a pixel array then the
|
|
implementation of unbind is the same as unmap */
|
|
if (bitmap->buffer)
|
|
_cogl_buffer_unbind (bitmap->buffer);
|
|
else
|
|
_cogl_bitmap_unmap (bitmap);
|
|
}
|