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
|
|
|
|
|
2011-10-13 17:34:30 -04:00
|
|
|
#include "cogl-util.h"
|
2010-07-25 16:36:41 -04:00
|
|
|
#include "cogl-debug.h"
|
2012-02-13 18:02:04 -05:00
|
|
|
#include "cogl-private.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"
|
2012-02-25 15:04:45 -05:00
|
|
|
#include "cogl-pixel-buffer.h"
|
2012-03-13 10:46:18 -04:00
|
|
|
#include "cogl-context-private.h"
|
2012-09-19 17:32:25 -04:00
|
|
|
#include "cogl-buffer-gl-private.h"
|
2012-11-08 12:54:10 -05:00
|
|
|
#include "cogl-error-private.h"
|
2008-04-25 09:37:36 -04:00
|
|
|
|
|
|
|
#include <string.h>
|
|
|
|
|
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->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
|
|
|
}
|
|
|
|
|
Switch use of primitive glib types to c99 equivalents
The coding style has for a long time said to avoid using redundant glib
data types such as gint or gchar etc because we feel that they make the
code look unnecessarily foreign to developers coming from outside of the
Gnome developer community.
Note: When we tried to find the historical rationale for the types we
just found that they were apparently only added for consistent syntax
highlighting which didn't seem that compelling.
Up until now we have been continuing to use some of the platform
specific type such as gint{8,16,32,64} and gsize but this patch switches
us over to using the standard c99 equivalents instead so we can further
ensure that our code looks familiar to the widest range of C developers
who might potentially contribute to Cogl.
So instead of using the gint{8,16,32,64} and guint{8,16,32,64} types this
switches all Cogl code to instead use the int{8,16,32,64}_t and
uint{8,16,32,64}_t c99 types instead.
Instead of gsize we now use size_t
For now we are not going to use the c99 _Bool type and instead we have
introduced a new CoglBool type to use instead of gboolean.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit 5967dad2400d32ca6319cef6cb572e81bf2c15f0)
2012-04-16 16:56:40 -04:00
|
|
|
CoglBool
|
2012-11-08 12:54:10 -05:00
|
|
|
_cogl_bitmap_convert_premult_status (CoglBitmap *bmp,
|
|
|
|
CoglPixelFormat dst_format,
|
|
|
|
CoglError **error)
|
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 &&
|
2012-02-29 07:27:19 -05:00
|
|
|
(dst_format & COGL_PREMULT_BIT) == 0 &&
|
|
|
|
COGL_PIXEL_FORMAT_CAN_HAVE_PREMULT (dst_format))
|
2012-11-08 12:54:10 -05:00
|
|
|
return _cogl_bitmap_unpremult (bmp, error);
|
2010-01-29 10:15:08 -05:00
|
|
|
|
|
|
|
/* Do we need to premultiply? */
|
|
|
|
if ((bmp->format & COGL_PREMULT_BIT) == 0 &&
|
2012-02-29 07:27:19 -05:00
|
|
|
COGL_PIXEL_FORMAT_CAN_HAVE_PREMULT (bmp->format) &&
|
2010-01-29 10:15:08 -05:00
|
|
|
(dst_format & COGL_PREMULT_BIT) > 0)
|
|
|
|
/* Try premultiplying using imaging library */
|
2012-11-08 12:54:10 -05:00
|
|
|
return _cogl_bitmap_premult (bmp, error);
|
2010-01-29 10:15:08 -05:00
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2010-12-17 09:52:25 -05:00
|
|
|
CoglBitmap *
|
2012-11-08 12:54:10 -05:00
|
|
|
_cogl_bitmap_copy (CoglBitmap *src_bmp,
|
|
|
|
CoglError **error)
|
2010-12-17 09:52:25 -05:00
|
|
|
{
|
|
|
|
CoglBitmap *dst_bmp;
|
2012-02-25 15:18:05 -05:00
|
|
|
CoglPixelFormat src_format = cogl_bitmap_get_format (src_bmp);
|
|
|
|
int width = cogl_bitmap_get_width (src_bmp);
|
|
|
|
int height = cogl_bitmap_get_height (src_bmp);
|
2010-12-17 09:52:25 -05:00
|
|
|
|
2012-03-13 10:46:18 -04:00
|
|
|
dst_bmp =
|
2012-04-04 08:57:42 -04:00
|
|
|
_cogl_bitmap_new_with_malloc_buffer (src_bmp->context,
|
2012-03-13 10:46:18 -04:00
|
|
|
width, height,
|
2012-11-08 17:14:18 -05:00
|
|
|
src_format,
|
|
|
|
error);
|
|
|
|
if (!dst_bmp)
|
|
|
|
return NULL;
|
2010-12-17 09:52:25 -05:00
|
|
|
|
2012-11-08 12:54:10 -05:00
|
|
|
if (!_cogl_bitmap_copy_subregion (src_bmp,
|
|
|
|
dst_bmp,
|
|
|
|
0, 0, /* src_x/y */
|
|
|
|
0, 0, /* dst_x/y */
|
|
|
|
width, height,
|
|
|
|
error))
|
|
|
|
{
|
|
|
|
cogl_object_unref (dst_bmp);
|
|
|
|
return NULL;
|
|
|
|
}
|
2010-12-17 09:52:25 -05:00
|
|
|
|
|
|
|
return dst_bmp;
|
|
|
|
}
|
|
|
|
|
Switch use of primitive glib types to c99 equivalents
The coding style has for a long time said to avoid using redundant glib
data types such as gint or gchar etc because we feel that they make the
code look unnecessarily foreign to developers coming from outside of the
Gnome developer community.
Note: When we tried to find the historical rationale for the types we
just found that they were apparently only added for consistent syntax
highlighting which didn't seem that compelling.
Up until now we have been continuing to use some of the platform
specific type such as gint{8,16,32,64} and gsize but this patch switches
us over to using the standard c99 equivalents instead so we can further
ensure that our code looks familiar to the widest range of C developers
who might potentially contribute to Cogl.
So instead of using the gint{8,16,32,64} and guint{8,16,32,64} types this
switches all Cogl code to instead use the int{8,16,32,64}_t and
uint{8,16,32,64}_t c99 types instead.
Instead of gsize we now use size_t
For now we are not going to use the c99 _Bool type and instead we have
introduced a new CoglBool type to use instead of gboolean.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit 5967dad2400d32ca6319cef6cb572e81bf2c15f0)
2012-04-16 16:56:40 -04:00
|
|
|
CoglBool
|
2008-04-25 09:37:36 -04:00
|
|
|
_cogl_bitmap_copy_subregion (CoglBitmap *src,
|
|
|
|
CoglBitmap *dst,
|
2012-11-08 12:54:10 -05:00
|
|
|
int src_x,
|
|
|
|
int src_y,
|
|
|
|
int dst_x,
|
|
|
|
int dst_y,
|
|
|
|
int width,
|
|
|
|
int height,
|
|
|
|
CoglError **error)
|
2008-04-25 09:37:36 -04:00
|
|
|
{
|
Switch use of primitive glib types to c99 equivalents
The coding style has for a long time said to avoid using redundant glib
data types such as gint or gchar etc because we feel that they make the
code look unnecessarily foreign to developers coming from outside of the
Gnome developer community.
Note: When we tried to find the historical rationale for the types we
just found that they were apparently only added for consistent syntax
highlighting which didn't seem that compelling.
Up until now we have been continuing to use some of the platform
specific type such as gint{8,16,32,64} and gsize but this patch switches
us over to using the standard c99 equivalents instead so we can further
ensure that our code looks familiar to the widest range of C developers
who might potentially contribute to Cogl.
So instead of using the gint{8,16,32,64} and guint{8,16,32,64} types this
switches all Cogl code to instead use the int{8,16,32,64}_t and
uint{8,16,32,64}_t c99 types instead.
Instead of gsize we now use size_t
For now we are not going to use the c99 _Bool type and instead we have
introduced a new CoglBool type to use instead of gboolean.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit 5967dad2400d32ca6319cef6cb572e81bf2c15f0)
2012-04-16 16:56:40 -04:00
|
|
|
uint8_t *srcdata;
|
|
|
|
uint8_t *dstdata;
|
|
|
|
int bpp;
|
|
|
|
int line;
|
|
|
|
CoglBool succeeded = FALSE;
|
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! */
|
2012-11-08 12:54:10 -05:00
|
|
|
_COGL_RETURN_VAL_IF_FAIL ((src->format & ~COGL_PREMULT_BIT) ==
|
|
|
|
(dst->format & ~COGL_PREMULT_BIT),
|
|
|
|
FALSE);
|
2012-03-01 09:44:41 -05:00
|
|
|
|
2012-02-13 18:02:04 -05:00
|
|
|
bpp = _cogl_pixel_format_get_bytes_per_pixel (src->format);
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2012-11-08 12:54:10 -05:00
|
|
|
if ((srcdata = _cogl_bitmap_map (src, COGL_BUFFER_ACCESS_READ, 0, error)))
|
2008-04-25 09:37:36 -04:00
|
|
|
{
|
2012-11-08 12:54:10 -05:00
|
|
|
if ((dstdata =
|
|
|
|
_cogl_bitmap_map (dst, COGL_BUFFER_ACCESS_WRITE, 0, error)))
|
2010-07-07 13:44:16 -04:00
|
|
|
{
|
|
|
|
srcdata += src_y * src->rowstride + src_x * bpp;
|
|
|
|
dstdata += dst_y * dst->rowstride + dst_x * bpp;
|
|
|
|
|
2012-11-08 12:54:10 -05:00
|
|
|
for (line = 0; line < height; ++line)
|
2010-07-07 13:44:16 -04:00
|
|
|
{
|
|
|
|
memcpy (dstdata, srcdata, width * bpp);
|
|
|
|
srcdata += src->rowstride;
|
|
|
|
dstdata += dst->rowstride;
|
|
|
|
}
|
|
|
|
|
2012-03-01 09:44:41 -05:00
|
|
|
succeeded = TRUE;
|
|
|
|
|
2010-07-07 13:44:16 -04:00
|
|
|
_cogl_bitmap_unmap (dst);
|
|
|
|
}
|
|
|
|
|
|
|
|
_cogl_bitmap_unmap (src);
|
2008-04-25 09:37:36 -04:00
|
|
|
}
|
2012-03-01 09:44:41 -05:00
|
|
|
|
|
|
|
return succeeded;
|
2008-04-25 09:37:36 -04:00
|
|
|
}
|
2009-01-07 12:02:43 -05:00
|
|
|
|
Switch use of primitive glib types to c99 equivalents
The coding style has for a long time said to avoid using redundant glib
data types such as gint or gchar etc because we feel that they make the
code look unnecessarily foreign to developers coming from outside of the
Gnome developer community.
Note: When we tried to find the historical rationale for the types we
just found that they were apparently only added for consistent syntax
highlighting which didn't seem that compelling.
Up until now we have been continuing to use some of the platform
specific type such as gint{8,16,32,64} and gsize but this patch switches
us over to using the standard c99 equivalents instead so we can further
ensure that our code looks familiar to the widest range of C developers
who might potentially contribute to Cogl.
So instead of using the gint{8,16,32,64} and guint{8,16,32,64} types this
switches all Cogl code to instead use the int{8,16,32,64}_t and
uint{8,16,32,64}_t c99 types instead.
Instead of gsize we now use size_t
For now we are not going to use the c99 _Bool type and instead we have
introduced a new CoglBool type to use instead of gboolean.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit 5967dad2400d32ca6319cef6cb572e81bf2c15f0)
2012-04-16 16:56:40 -04:00
|
|
|
CoglBool
|
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 *
|
2012-03-13 10:46:18 -04:00
|
|
|
cogl_bitmap_new_for_data (CoglContext *context,
|
|
|
|
int width,
|
|
|
|
int height,
|
|
|
|
CoglPixelFormat format,
|
|
|
|
int rowstride,
|
Switch use of primitive glib types to c99 equivalents
The coding style has for a long time said to avoid using redundant glib
data types such as gint or gchar etc because we feel that they make the
code look unnecessarily foreign to developers coming from outside of the
Gnome developer community.
Note: When we tried to find the historical rationale for the types we
just found that they were apparently only added for consistent syntax
highlighting which didn't seem that compelling.
Up until now we have been continuing to use some of the platform
specific type such as gint{8,16,32,64} and gsize but this patch switches
us over to using the standard c99 equivalents instead so we can further
ensure that our code looks familiar to the widest range of C developers
who might potentially contribute to Cogl.
So instead of using the gint{8,16,32,64} and guint{8,16,32,64} types this
switches all Cogl code to instead use the int{8,16,32,64}_t and
uint{8,16,32,64}_t c99 types instead.
Instead of gsize we now use size_t
For now we are not going to use the c99 _Bool type and instead we have
introduced a new CoglBool type to use instead of gboolean.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit 5967dad2400d32ca6319cef6cb572e81bf2c15f0)
2012-04-16 16:56:40 -04:00
|
|
|
uint8_t *data)
|
2010-07-07 13:44:16 -04:00
|
|
|
{
|
2012-03-13 10:46:18 -04:00
|
|
|
CoglBitmap *bmp;
|
|
|
|
|
|
|
|
g_return_val_if_fail (cogl_is_context (context), NULL);
|
2010-07-07 13:44:16 -04:00
|
|
|
|
2012-03-13 10:46:18 -04:00
|
|
|
bmp = g_slice_new (CoglBitmap);
|
2012-09-10 06:26:17 -04:00
|
|
|
bmp->context = context;
|
2010-07-07 13:44:16 -04:00
|
|
|
bmp->format = format;
|
|
|
|
bmp->width = width;
|
|
|
|
bmp->height = height;
|
|
|
|
bmp->rowstride = rowstride;
|
|
|
|
bmp->data = 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);
|
|
|
|
}
|
|
|
|
|
2012-03-13 10:46:18 -04:00
|
|
|
CoglBitmap *
|
|
|
|
_cogl_bitmap_new_with_malloc_buffer (CoglContext *context,
|
|
|
|
unsigned int width,
|
|
|
|
unsigned int height,
|
2012-11-08 17:14:18 -05:00
|
|
|
CoglPixelFormat format,
|
|
|
|
CoglError **error)
|
2012-03-13 10:46:18 -04:00
|
|
|
{
|
|
|
|
static CoglUserDataKey bitmap_free_key;
|
|
|
|
int bpp = _cogl_pixel_format_get_bytes_per_pixel (format);
|
|
|
|
int rowstride = ((width * bpp) + 3) & ~3;
|
2012-11-08 17:14:18 -05:00
|
|
|
uint8_t *data = g_try_malloc (rowstride * height);
|
2012-03-13 10:46:18 -04:00
|
|
|
CoglBitmap *bitmap;
|
|
|
|
|
2012-11-08 17:14:18 -05:00
|
|
|
if (!data)
|
|
|
|
{
|
|
|
|
_cogl_set_error (error,
|
|
|
|
COGL_SYSTEM_ERROR,
|
|
|
|
COGL_SYSTEM_ERROR_NO_MEMORY,
|
|
|
|
"Failed to allocate memory for bitmap");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2012-03-13 10:46:18 -04:00
|
|
|
bitmap = cogl_bitmap_new_for_data (context,
|
|
|
|
width, height,
|
|
|
|
format,
|
|
|
|
rowstride,
|
|
|
|
data);
|
|
|
|
cogl_object_set_user_data (COGL_OBJECT (bitmap),
|
|
|
|
&bitmap_free_key,
|
|
|
|
data,
|
|
|
|
g_free);
|
|
|
|
|
|
|
|
return bitmap;
|
|
|
|
}
|
|
|
|
|
2010-07-07 13:44:16 -04:00
|
|
|
CoglBitmap *
|
|
|
|
_cogl_bitmap_new_shared (CoglBitmap *shared_bmp,
|
|
|
|
CoglPixelFormat format,
|
|
|
|
int width,
|
|
|
|
int height,
|
|
|
|
int rowstride)
|
|
|
|
{
|
2012-03-13 10:46:18 -04:00
|
|
|
CoglBitmap *bmp;
|
|
|
|
|
2012-04-04 08:57:42 -04:00
|
|
|
bmp = cogl_bitmap_new_for_data (shared_bmp->context,
|
2012-03-13 10:46:18 -04:00
|
|
|
width, height,
|
|
|
|
format,
|
|
|
|
rowstride,
|
|
|
|
NULL /* data */);
|
2010-07-07 13:44:16 -04:00
|
|
|
|
|
|
|
bmp->shared_bmp = cogl_object_ref (shared_bmp);
|
|
|
|
|
|
|
|
return bmp;
|
|
|
|
}
|
|
|
|
|
2010-05-27 19:51:40 -04:00
|
|
|
CoglBitmap *
|
2012-05-09 14:43:06 -04:00
|
|
|
cogl_bitmap_new_from_file (const char *filename,
|
2012-08-31 14:28:27 -04:00
|
|
|
CoglError **error)
|
2009-01-07 12:02:43 -05:00
|
|
|
{
|
2012-05-09 14:43:06 -04:00
|
|
|
_COGL_GET_CONTEXT (ctx, NULL);
|
|
|
|
|
|
|
|
_COGL_RETURN_VAL_IF_FAIL (filename != NULL, NULL);
|
2012-04-16 09:14:10 -04:00
|
|
|
_COGL_RETURN_VAL_IF_FAIL (error == NULL || *error == NULL, NULL);
|
2009-01-07 12:02:43 -05:00
|
|
|
|
2012-05-09 14:43:06 -04:00
|
|
|
return _cogl_bitmap_from_file (ctx, filename, error);
|
2010-07-07 13:44:16 -04:00
|
|
|
}
|
|
|
|
|
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
|
|
|
|
2012-03-13 10:46:18 -04:00
|
|
|
bmp = cogl_bitmap_new_for_data (buffer->context,
|
|
|
|
width, height,
|
|
|
|
format,
|
|
|
|
rowstride,
|
|
|
|
NULL /* data */);
|
2010-07-15 08:05:55 -04:00
|
|
|
|
|
|
|
bmp->buffer = cogl_object_ref (buffer);
|
|
|
|
bmp->data = GINT_TO_POINTER (offset);
|
|
|
|
|
|
|
|
return bmp;
|
|
|
|
}
|
|
|
|
|
2012-02-25 15:04:45 -05:00
|
|
|
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 */
|
2012-11-08 12:54:10 -05:00
|
|
|
_COGL_RETURN_VAL_IF_FAIL (format != COGL_PIXEL_FORMAT_ANY, NULL);
|
2012-02-25 15:04:45 -05:00
|
|
|
|
|
|
|
/* 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);
|
|
|
|
|
2012-11-08 12:54:10 -05:00
|
|
|
pixel_buffer =
|
|
|
|
cogl_pixel_buffer_new (context,
|
|
|
|
height * rowstride,
|
|
|
|
NULL); /* data */
|
2012-02-25 15:04:45 -05:00
|
|
|
|
2012-11-08 12:54:10 -05:00
|
|
|
_COGL_RETURN_VAL_IF_FAIL (pixel_buffer != NULL, NULL);
|
2012-02-25 15:04:45 -05:00
|
|
|
|
|
|
|
bitmap = cogl_bitmap_new_from_buffer (COGL_BUFFER (pixel_buffer),
|
|
|
|
format,
|
|
|
|
width, height,
|
|
|
|
rowstride,
|
|
|
|
0 /* offset */);
|
|
|
|
|
|
|
|
cogl_object_unref (pixel_buffer);
|
|
|
|
|
|
|
|
return bitmap;
|
|
|
|
}
|
|
|
|
|
2012-05-09 14:43:06 -04:00
|
|
|
#ifdef COGL_HAS_ANDROID_SUPPORT
|
|
|
|
CoglBitmap *
|
|
|
|
cogl_android_bitmap_new_from_asset (CoglContext *ctx,
|
|
|
|
AAssetManager *manager,
|
|
|
|
const char *filename,
|
2012-08-31 14:28:27 -04:00
|
|
|
CoglError **error)
|
2012-05-09 14:43:06 -04:00
|
|
|
{
|
|
|
|
_COGL_RETURN_VAL_IF_FAIL (ctx != NULL, NULL);
|
|
|
|
_COGL_RETURN_VAL_IF_FAIL (manager != NULL, NULL);
|
|
|
|
_COGL_RETURN_VAL_IF_FAIL (filename != NULL, NULL);
|
|
|
|
_COGL_RETURN_VAL_IF_FAIL (error == NULL || *error == NULL, NULL);
|
|
|
|
|
|
|
|
return _cogl_android_bitmap_new_from_asset (ctx, manager, filename, error);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2010-07-07 13:44:16 -04:00
|
|
|
CoglPixelFormat
|
2012-02-25 15:18:05 -05:00
|
|
|
cogl_bitmap_get_format (CoglBitmap *bitmap)
|
2010-07-07 13:44:16 -04:00
|
|
|
{
|
|
|
|
return bitmap->format;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
_cogl_bitmap_set_format (CoglBitmap *bitmap,
|
|
|
|
CoglPixelFormat format)
|
|
|
|
{
|
|
|
|
bitmap->format = format;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2012-02-25 15:18:05 -05:00
|
|
|
cogl_bitmap_get_width (CoglBitmap *bitmap)
|
2010-07-07 13:44:16 -04:00
|
|
|
{
|
|
|
|
return bitmap->width;
|
2009-01-07 12:02:43 -05:00
|
|
|
}
|
|
|
|
|
2010-07-07 13:44:16 -04:00
|
|
|
int
|
2012-02-25 15:18:05 -05:00
|
|
|
cogl_bitmap_get_height (CoglBitmap *bitmap)
|
2010-07-07 13:44:16 -04:00
|
|
|
{
|
|
|
|
return bitmap->height;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2012-02-25 15:18:05 -05:00
|
|
|
cogl_bitmap_get_rowstride (CoglBitmap *bitmap)
|
2010-07-07 13:44:16 -04:00
|
|
|
{
|
|
|
|
return bitmap->rowstride;
|
|
|
|
}
|
|
|
|
|
2012-02-25 15:28:50 -05:00
|
|
|
CoglPixelBuffer *
|
|
|
|
cogl_bitmap_get_buffer (CoglBitmap *bitmap)
|
|
|
|
{
|
|
|
|
while (bitmap->shared_bmp)
|
|
|
|
bitmap = bitmap->shared_bmp;
|
|
|
|
|
|
|
|
return COGL_PIXEL_BUFFER (bitmap->buffer);
|
|
|
|
}
|
|
|
|
|
2012-08-31 14:28:27 -04:00
|
|
|
uint32_t
|
2012-02-25 15:18:05 -05:00
|
|
|
cogl_bitmap_error_quark (void)
|
|
|
|
{
|
|
|
|
return g_quark_from_static_string ("cogl-bitmap-error-quark");
|
|
|
|
}
|
|
|
|
|
Switch use of primitive glib types to c99 equivalents
The coding style has for a long time said to avoid using redundant glib
data types such as gint or gchar etc because we feel that they make the
code look unnecessarily foreign to developers coming from outside of the
Gnome developer community.
Note: When we tried to find the historical rationale for the types we
just found that they were apparently only added for consistent syntax
highlighting which didn't seem that compelling.
Up until now we have been continuing to use some of the platform
specific type such as gint{8,16,32,64} and gsize but this patch switches
us over to using the standard c99 equivalents instead so we can further
ensure that our code looks familiar to the widest range of C developers
who might potentially contribute to Cogl.
So instead of using the gint{8,16,32,64} and guint{8,16,32,64} types this
switches all Cogl code to instead use the int{8,16,32,64}_t and
uint{8,16,32,64}_t c99 types instead.
Instead of gsize we now use size_t
For now we are not going to use the c99 _Bool type and instead we have
introduced a new CoglBool type to use instead of gboolean.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit 5967dad2400d32ca6319cef6cb572e81bf2c15f0)
2012-04-16 16:56:40 -04:00
|
|
|
uint8_t *
|
2010-07-07 13:44:16 -04:00
|
|
|
_cogl_bitmap_map (CoglBitmap *bitmap,
|
|
|
|
CoglBufferAccess access,
|
2012-11-08 12:54:10 -05:00
|
|
|
CoglBufferMapHint hints,
|
|
|
|
CoglError **error)
|
2010-07-07 13:44:16 -04:00
|
|
|
{
|
|
|
|
/* Divert to another bitmap if this data is shared */
|
|
|
|
if (bitmap->shared_bmp)
|
2012-11-08 12:54:10 -05:00
|
|
|
return _cogl_bitmap_map (bitmap->shared_bmp, access, hints, error);
|
2010-07-07 13:44:16 -04:00
|
|
|
|
|
|
|
g_assert (!bitmap->mapped);
|
|
|
|
|
2010-07-15 08:05:55 -04:00
|
|
|
if (bitmap->buffer)
|
|
|
|
{
|
2012-11-08 12:54:10 -05:00
|
|
|
uint8_t *data = _cogl_buffer_map (bitmap->buffer,
|
|
|
|
access,
|
|
|
|
hints,
|
|
|
|
error);
|
2010-07-15 08:05:55 -04:00
|
|
|
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
Switch use of primitive glib types to c99 equivalents
The coding style has for a long time said to avoid using redundant glib
data types such as gint or gchar etc because we feel that they make the
code look unnecessarily foreign to developers coming from outside of the
Gnome developer community.
Note: When we tried to find the historical rationale for the types we
just found that they were apparently only added for consistent syntax
highlighting which didn't seem that compelling.
Up until now we have been continuing to use some of the platform
specific type such as gint{8,16,32,64} and gsize but this patch switches
us over to using the standard c99 equivalents instead so we can further
ensure that our code looks familiar to the widest range of C developers
who might potentially contribute to Cogl.
So instead of using the gint{8,16,32,64} and guint{8,16,32,64} types this
switches all Cogl code to instead use the int{8,16,32,64}_t and
uint{8,16,32,64}_t c99 types instead.
Instead of gsize we now use size_t
For now we are not going to use the c99 _Bool type and instead we have
introduced a new CoglBool type to use instead of gboolean.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit 5967dad2400d32ca6319cef6cb572e81bf2c15f0)
2012-04-16 16:56:40 -04:00
|
|
|
uint8_t *
|
2012-09-19 16:59:19 -04:00
|
|
|
_cogl_bitmap_gl_bind (CoglBitmap *bitmap,
|
|
|
|
CoglBufferAccess access,
|
2012-11-08 12:54:10 -05:00
|
|
|
CoglBufferMapHint hints,
|
|
|
|
CoglError **error)
|
2010-07-15 08:05:55 -04:00
|
|
|
{
|
Switch use of primitive glib types to c99 equivalents
The coding style has for a long time said to avoid using redundant glib
data types such as gint or gchar etc because we feel that they make the
code look unnecessarily foreign to developers coming from outside of the
Gnome developer community.
Note: When we tried to find the historical rationale for the types we
just found that they were apparently only added for consistent syntax
highlighting which didn't seem that compelling.
Up until now we have been continuing to use some of the platform
specific type such as gint{8,16,32,64} and gsize but this patch switches
us over to using the standard c99 equivalents instead so we can further
ensure that our code looks familiar to the widest range of C developers
who might potentially contribute to Cogl.
So instead of using the gint{8,16,32,64} and guint{8,16,32,64} types this
switches all Cogl code to instead use the int{8,16,32,64}_t and
uint{8,16,32,64}_t c99 types instead.
Instead of gsize we now use size_t
For now we are not going to use the c99 _Bool type and instead we have
introduced a new CoglBool type to use instead of gboolean.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit 5967dad2400d32ca6319cef6cb572e81bf2c15f0)
2012-04-16 16:56:40 -04:00
|
|
|
uint8_t *ptr;
|
2012-11-08 12:54:10 -05:00
|
|
|
CoglError *internal_error = NULL;
|
2010-07-15 08:05:55 -04:00
|
|
|
|
|
|
|
/* Divert to another bitmap if this data is shared */
|
|
|
|
if (bitmap->shared_bmp)
|
2012-11-08 12:54:10 -05:00
|
|
|
return _cogl_bitmap_gl_bind (bitmap->shared_bmp, access, hints, error);
|
2010-07-15 08:05:55 -04:00
|
|
|
|
2012-11-08 12:54:10 -05:00
|
|
|
_COGL_RETURN_VAL_IF_FAIL (!bitmap->bound, NULL);
|
2010-07-15 08:05:55 -04:00
|
|
|
|
|
|
|
/* If the bitmap wasn't created from a buffer then the
|
|
|
|
implementation of bind is the same as map */
|
|
|
|
if (bitmap->buffer == NULL)
|
|
|
|
{
|
2012-11-08 12:54:10 -05:00
|
|
|
uint8_t *data = _cogl_bitmap_map (bitmap, access, hints, error);
|
2010-07-15 08:05:55 -04:00
|
|
|
if (data)
|
|
|
|
bitmap->bound = TRUE;
|
|
|
|
return data;
|
|
|
|
}
|
|
|
|
|
|
|
|
bitmap->bound = TRUE;
|
|
|
|
|
2010-10-12 08:14:17 -04:00
|
|
|
if (access == COGL_BUFFER_ACCESS_READ)
|
2012-09-19 16:59:19 -04:00
|
|
|
ptr = _cogl_buffer_gl_bind (bitmap->buffer,
|
2012-11-08 12:54:10 -05:00
|
|
|
COGL_BUFFER_BIND_TARGET_PIXEL_UNPACK,
|
|
|
|
&internal_error);
|
2010-10-12 08:14:17 -04:00
|
|
|
else if (access == COGL_BUFFER_ACCESS_WRITE)
|
2012-09-19 16:59:19 -04:00
|
|
|
ptr = _cogl_buffer_gl_bind (bitmap->buffer,
|
2012-11-08 12:54:10 -05:00
|
|
|
COGL_BUFFER_BIND_TARGET_PIXEL_PACK,
|
|
|
|
&internal_error);
|
2010-07-15 08:05:55 -04:00
|
|
|
else
|
2012-11-08 12:54:10 -05:00
|
|
|
{
|
|
|
|
ptr = NULL;
|
|
|
|
g_assert_not_reached ();
|
|
|
|
}
|
|
|
|
|
|
|
|
/* NB: _cogl_buffer_gl_bind() may return NULL in non-error
|
|
|
|
* conditions so we have to explicitly check internal_error to see
|
|
|
|
* if an exception was thrown */
|
|
|
|
if (internal_error)
|
|
|
|
{
|
2012-11-19 15:14:55 -05:00
|
|
|
_cogl_propagate_error (error, internal_error);
|
2012-11-08 12:54:10 -05:00
|
|
|
return NULL;
|
|
|
|
}
|
2010-07-15 08:05:55 -04:00
|
|
|
|
|
|
|
/* The data pointer actually stores the offset */
|
2012-11-08 12:54:10 -05:00
|
|
|
return ptr + GPOINTER_TO_INT (bitmap->data);
|
2010-07-15 08:05:55 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2012-09-19 16:59:19 -04:00
|
|
|
_cogl_bitmap_gl_unbind (CoglBitmap *bitmap)
|
2010-07-15 08:05:55 -04:00
|
|
|
{
|
|
|
|
/* Divert to another bitmap if this data is shared */
|
|
|
|
if (bitmap->shared_bmp)
|
2011-07-18 08:52:45 -04:00
|
|
|
{
|
2012-09-19 16:59:19 -04:00
|
|
|
_cogl_bitmap_gl_unbind (bitmap->shared_bmp);
|
2011-07-18 08:52:45 -04:00
|
|
|
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)
|
2012-09-19 16:59:19 -04:00
|
|
|
_cogl_buffer_gl_unbind (bitmap->buffer);
|
2010-07-15 08:05:55 -04:00
|
|
|
else
|
|
|
|
_cogl_bitmap_unmap (bitmap);
|
2010-07-07 13:44:16 -04:00
|
|
|
}
|
2012-04-04 08:57:42 -04:00
|
|
|
|
|
|
|
CoglContext *
|
|
|
|
_cogl_bitmap_get_context (CoglBitmap *bitmap)
|
|
|
|
{
|
|
|
|
return bitmap->context;
|
|
|
|
}
|