2008-04-25 09:37:36 -04:00
|
|
|
/*
|
2009-04-27 10:48:12 -04:00
|
|
|
* Cogl
|
2008-04-25 09:37:36 -04:00
|
|
|
*
|
2009-04-27 10:48:12 -04:00
|
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
2008-04-25 09:37:36 -04:00
|
|
|
*
|
2009-04-27 10:48:12 -04:00
|
|
|
* Copyright (C) 2007,2008,2009 Intel Corporation.
|
2008-04-25 09:37:36 -04:00
|
|
|
*
|
|
|
|
* 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
|
2010-03-01 07:56:10 -05:00
|
|
|
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*
|
|
|
|
*
|
2008-04-25 09:37:36 -04:00
|
|
|
*/
|
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#include "config.h"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include "cogl.h"
|
2011-10-13 17:34:30 -04:00
|
|
|
#include "cogl-util.h"
|
2010-07-25 16:36:41 -04:00
|
|
|
#include "cogl-debug.h"
|
2008-04-25 09:37:36 -04:00
|
|
|
#include "cogl-internal.h"
|
2009-04-30 13:00:22 -04:00
|
|
|
#include "cogl-bitmap-private.h"
|
2010-07-15 08:05:55 -04:00
|
|
|
#include "cogl-buffer-private.h"
|
2008-04-25 09:37:36 -04:00
|
|
|
|
|
|
|
#include <string.h>
|
|
|
|
|
2010-07-07 13:44:16 -04:00
|
|
|
struct _CoglBitmap
|
|
|
|
{
|
|
|
|
CoglHandleObject _parent;
|
|
|
|
CoglPixelFormat format;
|
|
|
|
int width;
|
|
|
|
int height;
|
|
|
|
int rowstride;
|
|
|
|
|
|
|
|
guint8 *data;
|
|
|
|
CoglBitmapDestroyNotify destroy_fn;
|
|
|
|
void *destroy_fn_data;
|
|
|
|
|
|
|
|
gboolean mapped;
|
2010-07-15 08:05:55 -04:00
|
|
|
gboolean bound;
|
2010-07-07 13:44:16 -04:00
|
|
|
|
|
|
|
/* If this is non-null then 'data' is ignored and instead it is
|
|
|
|
fetched from this shared bitmap. */
|
|
|
|
CoglBitmap *shared_bmp;
|
2010-07-15 08:05:55 -04:00
|
|
|
|
|
|
|
/* 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;
|
2010-07-07 13:44:16 -04:00
|
|
|
};
|
|
|
|
|
2009-04-30 13:00:22 -04:00
|
|
|
static void _cogl_bitmap_free (CoglBitmap *bmp);
|
|
|
|
|
2010-05-27 19:51:40 -04:00
|
|
|
COGL_OBJECT_DEFINE (Bitmap, bitmap);
|
2009-04-30 13:00:22 -04:00
|
|
|
|
|
|
|
static void
|
|
|
|
_cogl_bitmap_free (CoglBitmap *bmp)
|
|
|
|
{
|
2010-07-07 13:44:16 -04:00
|
|
|
g_assert (!bmp->mapped);
|
2010-07-15 08:05:55 -04:00
|
|
|
g_assert (!bmp->bound);
|
2010-07-07 13:44:16 -04:00
|
|
|
|
|
|
|
if (bmp->destroy_fn)
|
|
|
|
bmp->destroy_fn (bmp->data, bmp->destroy_fn_data);
|
|
|
|
|
|
|
|
if (bmp->shared_bmp)
|
|
|
|
cogl_object_unref (bmp->shared_bmp);
|
|
|
|
|
2010-07-15 08:05:55 -04:00
|
|
|
if (bmp->buffer)
|
|
|
|
cogl_object_unref (bmp->buffer);
|
|
|
|
|
2010-07-07 13:44:16 -04:00
|
|
|
g_slice_free (CoglBitmap, bmp);
|
2009-04-30 13:00:22 -04:00
|
|
|
}
|
|
|
|
|
cogl: improves header and coding style consistency
We've had complaints that our Cogl code/headers are a bit "special" so
this is a first pass at tidying things up by giving them some
consistency. These changes are all consistent with how new code in Cogl
is being written, but the style isn't consistently applied across all
code yet.
There are two parts to this patch; but since each one required a large
amount of effort to maintain tidy indenting it made sense to combine the
changes to reduce the time spent re indenting the same lines.
The first change is to use a consistent style for declaring function
prototypes in headers. Cogl headers now consistently use this style for
prototypes:
return_type
cogl_function_name (CoglType arg0,
CoglType arg1);
Not everyone likes this style, but it seems that most of the currently
active Cogl developers agree on it.
The second change is to constrain the use of redundant glib data types
in Cogl. Uses of gint, guint, gfloat, glong, gulong and gchar have all
been replaced with int, unsigned int, float, long, unsigned long and char
respectively. When talking about pixel data; use of guchar has been
replaced with guint8, otherwise unsigned char can be used.
The glib types that we continue to use for portability are gboolean,
gint{8,16,32,64}, guint{8,16,32,64} and gsize.
The general intention is that Cogl should look palatable to the widest
range of C programmers including those outside the Gnome community so
- especially for the public API - we want to minimize the number of
foreign looking typedefs.
2010-02-09 20:57:32 -05:00
|
|
|
int
|
2008-04-25 09:37:36 -04:00
|
|
|
_cogl_get_format_bpp (CoglPixelFormat format)
|
|
|
|
{
|
cogl: improves header and coding style consistency
We've had complaints that our Cogl code/headers are a bit "special" so
this is a first pass at tidying things up by giving them some
consistency. These changes are all consistent with how new code in Cogl
is being written, but the style isn't consistently applied across all
code yet.
There are two parts to this patch; but since each one required a large
amount of effort to maintain tidy indenting it made sense to combine the
changes to reduce the time spent re indenting the same lines.
The first change is to use a consistent style for declaring function
prototypes in headers. Cogl headers now consistently use this style for
prototypes:
return_type
cogl_function_name (CoglType arg0,
CoglType arg1);
Not everyone likes this style, but it seems that most of the currently
active Cogl developers agree on it.
The second change is to constrain the use of redundant glib data types
in Cogl. Uses of gint, guint, gfloat, glong, gulong and gchar have all
been replaced with int, unsigned int, float, long, unsigned long and char
respectively. When talking about pixel data; use of guchar has been
replaced with guint8, otherwise unsigned char can be used.
The glib types that we continue to use for portability are gboolean,
gint{8,16,32,64}, guint{8,16,32,64} and gsize.
The general intention is that Cogl should look palatable to the widest
range of C programmers including those outside the Gnome community so
- especially for the public API - we want to minimize the number of
foreign looking typedefs.
2010-02-09 20:57:32 -05:00
|
|
|
int bpp_lut[] = {
|
2008-04-25 09:37:36 -04:00
|
|
|
0, /* invalid */
|
|
|
|
1, /* A_8 */
|
|
|
|
3, /* 888 */
|
|
|
|
4, /* 8888 */
|
|
|
|
2, /* 565 */
|
|
|
|
2, /* 4444 */
|
|
|
|
2, /* 5551 */
|
|
|
|
2, /* YUV */
|
|
|
|
1 /* G_8 */
|
|
|
|
};
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-04-25 09:37:36 -04:00
|
|
|
return bpp_lut [format & COGL_UNORDERED_MASK];
|
|
|
|
}
|
|
|
|
|
|
|
|
gboolean
|
2010-01-29 10:15:08 -05:00
|
|
|
_cogl_bitmap_convert_premult_status (CoglBitmap *bmp,
|
|
|
|
CoglPixelFormat dst_format)
|
2008-04-25 09:37:36 -04:00
|
|
|
{
|
2010-01-29 10:15:08 -05:00
|
|
|
/* Do we need to unpremultiply? */
|
|
|
|
if ((bmp->format & COGL_PREMULT_BIT) > 0 &&
|
|
|
|
(dst_format & COGL_PREMULT_BIT) == 0)
|
|
|
|
/* Try unpremultiplying using imaging library */
|
|
|
|
return (_cogl_bitmap_unpremult (bmp)
|
|
|
|
/* ... or try fallback */
|
|
|
|
|| _cogl_bitmap_fallback_unpremult (bmp));
|
|
|
|
|
|
|
|
/* Do we need to premultiply? */
|
|
|
|
if ((bmp->format & COGL_PREMULT_BIT) == 0 &&
|
|
|
|
(dst_format & COGL_PREMULT_BIT) > 0)
|
|
|
|
/* Try premultiplying using imaging library */
|
|
|
|
return (_cogl_bitmap_premult (bmp)
|
|
|
|
/* ... or try fallback */
|
|
|
|
|| _cogl_bitmap_fallback_premult (bmp));
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2010-07-07 13:44:16 -04:00
|
|
|
CoglBitmap *
|
|
|
|
_cogl_bitmap_convert_format_and_premult (CoglBitmap *bmp,
|
2010-01-29 10:15:08 -05:00
|
|
|
CoglPixelFormat dst_format)
|
|
|
|
{
|
2010-07-07 13:44:16 -04:00
|
|
|
CoglPixelFormat src_format = _cogl_bitmap_get_format (bmp);
|
|
|
|
CoglBitmap *dst_bmp;
|
|
|
|
|
2008-04-25 09:37:36 -04:00
|
|
|
/* Is base format different (not considering premult status)? */
|
2010-07-07 13:44:16 -04:00
|
|
|
if ((src_format & COGL_UNPREMULT_MASK) !=
|
2008-04-25 09:37:36 -04:00
|
|
|
(dst_format & COGL_UNPREMULT_MASK))
|
|
|
|
{
|
|
|
|
/* Try converting using imaging library */
|
2010-07-07 13:44:16 -04:00
|
|
|
if ((dst_bmp = _cogl_bitmap_convert (bmp, dst_format)) == NULL)
|
2010-01-29 10:15:08 -05:00
|
|
|
{
|
|
|
|
/* ... or try fallback */
|
2010-07-07 13:44:16 -04:00
|
|
|
if ((dst_bmp = _cogl_bitmap_fallback_convert (bmp,
|
|
|
|
dst_format)) == NULL)
|
|
|
|
return NULL;
|
2010-01-29 10:15:08 -05:00
|
|
|
}
|
2008-04-25 09:37:36 -04:00
|
|
|
}
|
2010-01-29 10:15:08 -05:00
|
|
|
else
|
2008-04-25 09:37:36 -04:00
|
|
|
{
|
2010-07-07 13:44:16 -04:00
|
|
|
int rowstride = _cogl_bitmap_get_rowstride (bmp);
|
|
|
|
int height = _cogl_bitmap_get_height (bmp);
|
|
|
|
guint8 *data;
|
|
|
|
|
2010-01-29 10:15:08 -05:00
|
|
|
/* Copy the bitmap so that we can premultiply in-place */
|
2010-07-07 13:44:16 -04:00
|
|
|
|
|
|
|
if ((data = _cogl_bitmap_map (bmp, COGL_BUFFER_ACCESS_READ, 0)) == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
dst_bmp = _cogl_bitmap_new_from_data (g_memdup (data, height * rowstride),
|
|
|
|
src_format,
|
|
|
|
_cogl_bitmap_get_width (bmp),
|
|
|
|
height,
|
|
|
|
rowstride,
|
|
|
|
(CoglBitmapDestroyNotify) g_free,
|
|
|
|
NULL);
|
|
|
|
|
|
|
|
_cogl_bitmap_unmap (bmp);
|
2008-04-25 09:37:36 -04:00
|
|
|
}
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2010-07-07 13:44:16 -04:00
|
|
|
src_format = _cogl_bitmap_get_format (dst_bmp);
|
|
|
|
|
2010-03-26 18:34:56 -04:00
|
|
|
/* We only need to do a premult conversion if both formats have an
|
|
|
|
alpha channel. If we're converting from RGB to RGBA then the
|
|
|
|
alpha will have been filled with 255 so the premult won't do
|
|
|
|
anything or if we are converting from RGBA to RGB we're losing
|
|
|
|
information so either converting or not will be wrong for
|
|
|
|
transparent pixels */
|
2010-07-07 13:44:16 -04:00
|
|
|
if ((src_format & COGL_A_BIT) == COGL_A_BIT &&
|
2010-03-26 18:34:56 -04:00
|
|
|
(dst_format & COGL_A_BIT) == COGL_A_BIT &&
|
|
|
|
!_cogl_bitmap_convert_premult_status (dst_bmp, dst_format))
|
2008-04-25 09:37:36 -04:00
|
|
|
{
|
2010-07-07 13:44:16 -04:00
|
|
|
cogl_object_unref (dst_bmp);
|
|
|
|
return NULL;
|
2008-04-25 09:37:36 -04:00
|
|
|
}
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2010-07-07 13:44:16 -04:00
|
|
|
return dst_bmp;
|
2008-04-25 09:37:36 -04:00
|
|
|
}
|
|
|
|
|
2010-12-17 09:52:25 -05:00
|
|
|
CoglBitmap *
|
|
|
|
_cogl_bitmap_copy (CoglBitmap *src_bmp)
|
|
|
|
{
|
|
|
|
CoglBitmap *dst_bmp;
|
|
|
|
CoglPixelFormat src_format = _cogl_bitmap_get_format (src_bmp);
|
|
|
|
int bpp = _cogl_get_format_bpp (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;
|
|
|
|
}
|
|
|
|
|
2008-04-25 09:37:36 -04:00
|
|
|
void
|
|
|
|
_cogl_bitmap_copy_subregion (CoglBitmap *src,
|
|
|
|
CoglBitmap *dst,
|
cogl: improves header and coding style consistency
We've had complaints that our Cogl code/headers are a bit "special" so
this is a first pass at tidying things up by giving them some
consistency. These changes are all consistent with how new code in Cogl
is being written, but the style isn't consistently applied across all
code yet.
There are two parts to this patch; but since each one required a large
amount of effort to maintain tidy indenting it made sense to combine the
changes to reduce the time spent re indenting the same lines.
The first change is to use a consistent style for declaring function
prototypes in headers. Cogl headers now consistently use this style for
prototypes:
return_type
cogl_function_name (CoglType arg0,
CoglType arg1);
Not everyone likes this style, but it seems that most of the currently
active Cogl developers agree on it.
The second change is to constrain the use of redundant glib data types
in Cogl. Uses of gint, guint, gfloat, glong, gulong and gchar have all
been replaced with int, unsigned int, float, long, unsigned long and char
respectively. When talking about pixel data; use of guchar has been
replaced with guint8, otherwise unsigned char can be used.
The glib types that we continue to use for portability are gboolean,
gint{8,16,32,64}, guint{8,16,32,64} and gsize.
The general intention is that Cogl should look palatable to the widest
range of C programmers including those outside the Gnome community so
- especially for the public API - we want to minimize the number of
foreign looking typedefs.
2010-02-09 20:57:32 -05:00
|
|
|
int src_x,
|
|
|
|
int src_y,
|
|
|
|
int dst_x,
|
|
|
|
int dst_y,
|
|
|
|
int width,
|
|
|
|
int height)
|
2008-04-25 09:37:36 -04:00
|
|
|
{
|
cogl: improves header and coding style consistency
We've had complaints that our Cogl code/headers are a bit "special" so
this is a first pass at tidying things up by giving them some
consistency. These changes are all consistent with how new code in Cogl
is being written, but the style isn't consistently applied across all
code yet.
There are two parts to this patch; but since each one required a large
amount of effort to maintain tidy indenting it made sense to combine the
changes to reduce the time spent re indenting the same lines.
The first change is to use a consistent style for declaring function
prototypes in headers. Cogl headers now consistently use this style for
prototypes:
return_type
cogl_function_name (CoglType arg0,
CoglType arg1);
Not everyone likes this style, but it seems that most of the currently
active Cogl developers agree on it.
The second change is to constrain the use of redundant glib data types
in Cogl. Uses of gint, guint, gfloat, glong, gulong and gchar have all
been replaced with int, unsigned int, float, long, unsigned long and char
respectively. When talking about pixel data; use of guchar has been
replaced with guint8, otherwise unsigned char can be used.
The glib types that we continue to use for portability are gboolean,
gint{8,16,32,64}, guint{8,16,32,64} and gsize.
The general intention is that Cogl should look palatable to the widest
range of C programmers including those outside the Gnome community so
- especially for the public API - we want to minimize the number of
foreign looking typedefs.
2010-02-09 20:57:32 -05:00
|
|
|
guint8 *srcdata;
|
|
|
|
guint8 *dstdata;
|
|
|
|
int bpp;
|
|
|
|
int line;
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-04-25 09:37:36 -04:00
|
|
|
/* Intended only for fast copies when format is equal! */
|
|
|
|
g_assert (src->format == dst->format);
|
|
|
|
bpp = _cogl_get_format_bpp (src->format);
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2010-07-07 13:44:16 -04:00
|
|
|
if ((srcdata = _cogl_bitmap_map (src, COGL_BUFFER_ACCESS_READ, 0)))
|
2008-04-25 09:37:36 -04:00
|
|
|
{
|
2010-07-07 13:44:16 -04:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
_cogl_bitmap_unmap (dst);
|
|
|
|
}
|
|
|
|
|
|
|
|
_cogl_bitmap_unmap (src);
|
2008-04-25 09:37:36 -04:00
|
|
|
}
|
|
|
|
}
|
2009-01-07 12:02:43 -05:00
|
|
|
|
2009-01-12 11:52:20 -05:00
|
|
|
gboolean
|
cogl: improves header and coding style consistency
We've had complaints that our Cogl code/headers are a bit "special" so
this is a first pass at tidying things up by giving them some
consistency. These changes are all consistent with how new code in Cogl
is being written, but the style isn't consistently applied across all
code yet.
There are two parts to this patch; but since each one required a large
amount of effort to maintain tidy indenting it made sense to combine the
changes to reduce the time spent re indenting the same lines.
The first change is to use a consistent style for declaring function
prototypes in headers. Cogl headers now consistently use this style for
prototypes:
return_type
cogl_function_name (CoglType arg0,
CoglType arg1);
Not everyone likes this style, but it seems that most of the currently
active Cogl developers agree on it.
The second change is to constrain the use of redundant glib data types
in Cogl. Uses of gint, guint, gfloat, glong, gulong and gchar have all
been replaced with int, unsigned int, float, long, unsigned long and char
respectively. When talking about pixel data; use of guchar has been
replaced with guint8, otherwise unsigned char can be used.
The glib types that we continue to use for portability are gboolean,
gint{8,16,32,64}, guint{8,16,32,64} and gsize.
The general intention is that Cogl should look palatable to the widest
range of C programmers including those outside the Gnome community so
- especially for the public API - we want to minimize the number of
foreign looking typedefs.
2010-02-09 20:57:32 -05:00
|
|
|
cogl_bitmap_get_size_from_file (const char *filename,
|
|
|
|
int *width,
|
|
|
|
int *height)
|
2009-01-12 11:52:20 -05:00
|
|
|
{
|
|
|
|
return _cogl_bitmap_get_size_from_file (filename, width, height);
|
|
|
|
}
|
|
|
|
|
2010-07-07 13:44:16 -04:00
|
|
|
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;
|
2010-07-15 08:05:55 -04:00
|
|
|
bmp->bound = FALSE;
|
2010-07-07 13:44:16 -04:00
|
|
|
bmp->shared_bmp = NULL;
|
2010-07-15 08:05:55 -04:00
|
|
|
bmp->buffer = NULL;
|
2010-07-07 13:44:16 -04:00
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2010-05-27 19:51:40 -04:00
|
|
|
CoglBitmap *
|
cogl: improves header and coding style consistency
We've had complaints that our Cogl code/headers are a bit "special" so
this is a first pass at tidying things up by giving them some
consistency. These changes are all consistent with how new code in Cogl
is being written, but the style isn't consistently applied across all
code yet.
There are two parts to this patch; but since each one required a large
amount of effort to maintain tidy indenting it made sense to combine the
changes to reduce the time spent re indenting the same lines.
The first change is to use a consistent style for declaring function
prototypes in headers. Cogl headers now consistently use this style for
prototypes:
return_type
cogl_function_name (CoglType arg0,
CoglType arg1);
Not everyone likes this style, but it seems that most of the currently
active Cogl developers agree on it.
The second change is to constrain the use of redundant glib data types
in Cogl. Uses of gint, guint, gfloat, glong, gulong and gchar have all
been replaced with int, unsigned int, float, long, unsigned long and char
respectively. When talking about pixel data; use of guchar has been
replaced with guint8, otherwise unsigned char can be used.
The glib types that we continue to use for portability are gboolean,
gint{8,16,32,64}, guint{8,16,32,64} and gsize.
The general intention is that Cogl should look palatable to the widest
range of C programmers including those outside the Gnome community so
- especially for the public API - we want to minimize the number of
foreign looking typedefs.
2010-02-09 20:57:32 -05:00
|
|
|
cogl_bitmap_new_from_file (const char *filename,
|
|
|
|
GError **error)
|
2009-01-07 12:02:43 -05:00
|
|
|
{
|
2010-07-07 13:44:16 -04:00
|
|
|
CoglBitmap *bmp;
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2011-10-13 17:34:30 -04:00
|
|
|
_COGL_RETURN_VAL_IF_FAIL (error == NULL || *error == NULL, COGL_INVALID_HANDLE);
|
2009-01-07 12:02:43 -05:00
|
|
|
|
2010-07-07 13:44:16 -04:00
|
|
|
if ((bmp = _cogl_bitmap_from_file (filename, error)) == NULL)
|
2009-01-07 12:02:43 -05:00
|
|
|
{
|
|
|
|
/* Try fallback */
|
2010-07-07 13:44:16 -04:00
|
|
|
if ((bmp = _cogl_bitmap_fallback_from_file (filename))
|
|
|
|
&& error && *error)
|
|
|
|
{
|
|
|
|
g_error_free (*error);
|
|
|
|
*error = NULL;
|
|
|
|
}
|
2009-01-07 12:02:43 -05:00
|
|
|
}
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2010-07-07 13:44:16 -04:00
|
|
|
return bmp;
|
|
|
|
}
|
|
|
|
|
2010-07-15 08:05:55 -04:00
|
|
|
CoglBitmap *
|
2011-07-25 17:14:08 -04:00
|
|
|
cogl_bitmap_new_from_buffer (CoglBuffer *buffer,
|
|
|
|
CoglPixelFormat format,
|
|
|
|
int width,
|
|
|
|
int height,
|
|
|
|
int rowstride,
|
|
|
|
int offset)
|
2010-07-15 08:05:55 -04:00
|
|
|
{
|
|
|
|
CoglBitmap *bmp;
|
|
|
|
|
2011-10-13 17:34:30 -04:00
|
|
|
_COGL_RETURN_VAL_IF_FAIL (cogl_is_buffer (buffer), NULL);
|
2010-07-15 08:05:55 -04:00
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2010-07-07 13:44:16 -04:00
|
|
|
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;
|
2009-01-07 12:02:43 -05:00
|
|
|
}
|
|
|
|
|
2010-07-01 16:49:16 -04:00
|
|
|
GQuark
|
|
|
|
cogl_bitmap_error_quark (void)
|
|
|
|
{
|
|
|
|
return g_quark_from_static_string ("cogl-bitmap-error-quark");
|
|
|
|
}
|
2010-07-07 13:44:16 -04:00
|
|
|
|
|
|
|
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);
|
|
|
|
|
2010-07-15 08:05:55 -04:00
|
|
|
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;
|
|
|
|
}
|
2010-07-07 13:44:16 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
_cogl_bitmap_unmap (CoglBitmap *bitmap)
|
|
|
|
{
|
|
|
|
/* Divert to another bitmap if this data is shared */
|
|
|
|
if (bitmap->shared_bmp)
|
2011-07-18 08:52:45 -04:00
|
|
|
{
|
|
|
|
_cogl_bitmap_unmap (bitmap->shared_bmp);
|
|
|
|
return;
|
|
|
|
}
|
2010-07-07 13:44:16 -04:00
|
|
|
|
|
|
|
g_assert (bitmap->mapped);
|
|
|
|
bitmap->mapped = FALSE;
|
|
|
|
|
2010-07-15 08:05:55 -04:00
|
|
|
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;
|
|
|
|
|
2010-10-12 08:14:17 -04:00
|
|
|
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);
|
2010-07-15 08:05:55 -04:00
|
|
|
else
|
2010-10-12 08:14:17 -04:00
|
|
|
g_assert_not_reached ();
|
2010-07-15 08:05:55 -04:00
|
|
|
|
|
|
|
/* 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)
|
2011-07-18 08:52:45 -04:00
|
|
|
{
|
|
|
|
_cogl_bitmap_unbind (bitmap->shared_bmp);
|
|
|
|
return;
|
|
|
|
}
|
2010-07-15 08:05:55 -04:00
|
|
|
|
|
|
|
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)
|
2010-10-12 08:14:17 -04:00
|
|
|
_cogl_buffer_unbind (bitmap->buffer);
|
2010-07-15 08:05:55 -04:00
|
|
|
else
|
|
|
|
_cogl_bitmap_unmap (bitmap);
|
2010-07-07 13:44:16 -04:00
|
|
|
}
|