2008-04-25 13:37:36 +00:00
|
|
|
/*
|
2009-04-27 14:48:12 +00:00
|
|
|
* Cogl
|
2008-04-25 13:37:36 +00:00
|
|
|
*
|
2009-04-27 14:48:12 +00:00
|
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
2008-04-25 13:37:36 +00:00
|
|
|
*
|
2009-04-27 14:48:12 +00:00
|
|
|
* Copyright (C) 2007,2008,2009 Intel Corporation.
|
2008-04-25 13:37:36 +00: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 12:56:10 +00:00
|
|
|
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*
|
|
|
|
*
|
2008-04-25 13:37:36 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#include "config.h"
|
|
|
|
#endif
|
|
|
|
|
2012-02-13 23:02:04 +00:00
|
|
|
#include "cogl-private.h"
|
2009-04-30 17:00:22 +00:00
|
|
|
#include "cogl-bitmap-private.h"
|
2012-03-13 14:46:18 +00:00
|
|
|
#include "cogl-context-private.h"
|
2008-04-25 13:37:36 +00:00
|
|
|
|
|
|
|
#include <string.h>
|
|
|
|
|
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 20:56:40 +00:00
|
|
|
#define component_type uint8_t
|
2012-02-29 15:16:27 +00:00
|
|
|
/* We want to specially optimise the packing when we are converting
|
|
|
|
to/from an 8-bit type so that it won't do anything. That way for
|
|
|
|
example if we are just doing a swizzle conversion then the inner
|
|
|
|
loop for the conversion will be really simple */
|
|
|
|
#define UNPACK_BYTE(b) (b)
|
|
|
|
#define PACK_BYTE(b) (b)
|
|
|
|
#include "cogl-bitmap-packing.h"
|
|
|
|
#undef PACK_BYTE
|
|
|
|
#undef UNPACK_BYTE
|
|
|
|
#undef component_type
|
|
|
|
|
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 20:56:40 +00:00
|
|
|
#define component_type uint16_t
|
2012-02-29 15:16:27 +00:00
|
|
|
#define UNPACK_BYTE(b) (((b) * 65535 + 127) / 255)
|
|
|
|
#define PACK_BYTE(b) (((b) * 255 + 32767) / 65535)
|
|
|
|
#include "cogl-bitmap-packing.h"
|
|
|
|
#undef PACK_BYTE
|
|
|
|
#undef UNPACK_BYTE
|
|
|
|
#undef component_type
|
2008-04-25 13:37:36 +00:00
|
|
|
|
|
|
|
/* (Un)Premultiplication */
|
|
|
|
|
|
|
|
inline static void
|
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 20:56:40 +00:00
|
|
|
_cogl_unpremult_alpha_0 (uint8_t *dst)
|
2008-04-25 13:37:36 +00:00
|
|
|
{
|
|
|
|
dst[0] = 0;
|
|
|
|
dst[1] = 0;
|
|
|
|
dst[2] = 0;
|
|
|
|
dst[3] = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
inline static void
|
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 20:56:40 +00:00
|
|
|
_cogl_unpremult_alpha_last (uint8_t *dst)
|
2008-04-25 13:37:36 +00: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 20:56:40 +00:00
|
|
|
uint8_t alpha = dst[3];
|
2009-04-27 14:48:12 +00:00
|
|
|
|
2010-01-29 15:15:08 +00:00
|
|
|
dst[0] = (dst[0] * 255) / alpha;
|
|
|
|
dst[1] = (dst[1] * 255) / alpha;
|
|
|
|
dst[2] = (dst[2] * 255) / alpha;
|
2008-04-25 13:37:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
inline static void
|
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 20:56:40 +00:00
|
|
|
_cogl_unpremult_alpha_first (uint8_t *dst)
|
2008-04-25 13:37:36 +00: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 20:56:40 +00:00
|
|
|
uint8_t alpha = dst[0];
|
2009-04-27 14:48:12 +00:00
|
|
|
|
2010-01-29 15:15:08 +00:00
|
|
|
dst[1] = (dst[1] * 255) / alpha;
|
|
|
|
dst[2] = (dst[2] * 255) / alpha;
|
|
|
|
dst[3] = (dst[3] * 255) / alpha;
|
2008-04-25 13:37:36 +00:00
|
|
|
}
|
|
|
|
|
2009-05-09 18:39:01 +00:00
|
|
|
/* No division form of floor((c*a + 128)/255) (I first encountered
|
|
|
|
* this in the RENDER implementation in the X server.) Being exact
|
|
|
|
* is important for a == 255 - we want to get exactly c.
|
|
|
|
*/
|
2010-01-29 15:15:08 +00:00
|
|
|
#define MULT(d,a,t) \
|
|
|
|
G_STMT_START { \
|
|
|
|
t = d * a + 128; \
|
|
|
|
d = ((t >> 8) + t) >> 8; \
|
|
|
|
} G_STMT_END
|
2009-05-09 18:39:01 +00:00
|
|
|
|
|
|
|
inline static void
|
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 20:56:40 +00:00
|
|
|
_cogl_premult_alpha_last (uint8_t *dst)
|
2009-05-09 18:39:01 +00: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 20:56:40 +00:00
|
|
|
uint8_t alpha = dst[3];
|
2009-05-09 18:39:01 +00:00
|
|
|
/* Using a separate temporary per component has given slightly better
|
|
|
|
* code generation with GCC in the past; it shouldn't do any worse in
|
|
|
|
* any case.
|
|
|
|
*/
|
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-10 01:57:32 +00:00
|
|
|
unsigned int t1, t2, t3;
|
2010-01-29 15:15:08 +00:00
|
|
|
MULT(dst[0], alpha, t1);
|
|
|
|
MULT(dst[1], alpha, t2);
|
|
|
|
MULT(dst[2], alpha, t3);
|
2009-05-09 18:39:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
inline static void
|
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 20:56:40 +00:00
|
|
|
_cogl_premult_alpha_first (uint8_t *dst)
|
2009-05-09 18:39:01 +00: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 20:56:40 +00:00
|
|
|
uint8_t alpha = dst[0];
|
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-10 01:57:32 +00:00
|
|
|
unsigned int t1, t2, t3;
|
2009-05-09 18:39:01 +00:00
|
|
|
|
2010-01-29 15:15:08 +00:00
|
|
|
MULT(dst[1], alpha, t1);
|
|
|
|
MULT(dst[2], alpha, t2);
|
|
|
|
MULT(dst[3], alpha, t3);
|
2009-05-09 18:39:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#undef MULT
|
|
|
|
|
2009-12-18 21:17:21 +00:00
|
|
|
/* Use the SSE optimized version to premult four pixels at once when
|
|
|
|
it is available. The same assembler code works for x86 and x86-64
|
|
|
|
because it doesn't refer to any non-SSE registers directly */
|
|
|
|
#if defined(__SSE2__) && defined(__GNUC__) \
|
|
|
|
&& (defined(__x86_64) || defined(__i386))
|
|
|
|
#define COGL_USE_PREMULT_SSE2
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef COGL_USE_PREMULT_SSE2
|
|
|
|
|
|
|
|
inline static void
|
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 20:56:40 +00:00
|
|
|
_cogl_premult_alpha_last_four_pixels_sse2 (uint8_t *p)
|
2009-12-18 21:17:21 +00:00
|
|
|
{
|
|
|
|
/* 8 copies of 128 used below */
|
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 20:56:40 +00:00
|
|
|
static const int16_t eight_halves[8] __attribute__ ((aligned (16))) =
|
2009-12-18 21:17:21 +00:00
|
|
|
{ 128, 128, 128, 128, 128, 128, 128, 128 };
|
|
|
|
/* Mask of the rgb components of the four pixels */
|
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 20:56:40 +00:00
|
|
|
static const int8_t just_rgb[16] __attribute__ ((aligned (16))) =
|
2009-12-18 21:17:21 +00:00
|
|
|
{ 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x00,
|
|
|
|
0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x00 };
|
|
|
|
/* Each SSE register only holds two pixels because we need to work
|
|
|
|
with 16-bit intermediate values. We still do four pixels by
|
|
|
|
interleaving two registers in the hope that it will pipeline
|
|
|
|
better */
|
|
|
|
asm (/* Load eight_halves into xmm5 for later */
|
|
|
|
"movdqa (%1), %%xmm5\n"
|
|
|
|
/* Clear xmm3 */
|
|
|
|
"pxor %%xmm3, %%xmm3\n"
|
|
|
|
/* Load two pixels from p into the low half of xmm0 */
|
|
|
|
"movlps (%0), %%xmm0\n"
|
|
|
|
/* Load the next set of two pixels from p into the low half of xmm1 */
|
|
|
|
"movlps 8(%0), %%xmm1\n"
|
|
|
|
/* Unpack 8 bytes from the low quad-words in each register to 8
|
|
|
|
16-bit values */
|
|
|
|
"punpcklbw %%xmm3, %%xmm0\n"
|
|
|
|
"punpcklbw %%xmm3, %%xmm1\n"
|
|
|
|
/* Copy alpha values of the first pixel in xmm0 to all
|
|
|
|
components of the first pixel in xmm2 */
|
|
|
|
"pshuflw $255, %%xmm0, %%xmm2\n"
|
|
|
|
/* same for xmm1 and xmm3 */
|
|
|
|
"pshuflw $255, %%xmm1, %%xmm3\n"
|
|
|
|
/* The above also copies the second pixel directly so we now
|
|
|
|
want to replace the RGB components with copies of the alpha
|
|
|
|
components */
|
|
|
|
"pshufhw $255, %%xmm2, %%xmm2\n"
|
|
|
|
"pshufhw $255, %%xmm3, %%xmm3\n"
|
|
|
|
/* Multiply the rgb components by the alpha */
|
|
|
|
"pmullw %%xmm2, %%xmm0\n"
|
|
|
|
"pmullw %%xmm3, %%xmm1\n"
|
|
|
|
/* Add 128 to each component */
|
|
|
|
"paddw %%xmm5, %%xmm0\n"
|
|
|
|
"paddw %%xmm5, %%xmm1\n"
|
|
|
|
/* Copy the results to temporary registers xmm4 and xmm5 */
|
|
|
|
"movdqa %%xmm0, %%xmm4\n"
|
|
|
|
"movdqa %%xmm1, %%xmm5\n"
|
|
|
|
/* Divide the results by 256 */
|
|
|
|
"psrlw $8, %%xmm0\n"
|
|
|
|
"psrlw $8, %%xmm1\n"
|
|
|
|
/* Add the temporaries back in */
|
|
|
|
"paddw %%xmm4, %%xmm0\n"
|
|
|
|
"paddw %%xmm5, %%xmm1\n"
|
|
|
|
/* Divide again */
|
|
|
|
"psrlw $8, %%xmm0\n"
|
|
|
|
"psrlw $8, %%xmm1\n"
|
|
|
|
/* Pack the results back as bytes */
|
|
|
|
"packuswb %%xmm1, %%xmm0\n"
|
|
|
|
/* Load just_rgb into xmm3 for later */
|
|
|
|
"movdqa (%2), %%xmm3\n"
|
|
|
|
/* Reload all four pixels into xmm2 */
|
|
|
|
"movups (%0), %%xmm2\n"
|
|
|
|
/* Mask out the alpha from the results */
|
|
|
|
"andps %%xmm3, %%xmm0\n"
|
|
|
|
/* Mask out the RGB from the original four pixels */
|
|
|
|
"andnps %%xmm2, %%xmm3\n"
|
|
|
|
/* Combine the two to get the right alpha values */
|
|
|
|
"orps %%xmm3, %%xmm0\n"
|
|
|
|
/* Write to memory */
|
|
|
|
"movdqu %%xmm0, (%0)\n"
|
|
|
|
: /* no outputs */
|
|
|
|
: "r" (p), "r" (eight_halves), "r" (just_rgb)
|
|
|
|
: "xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5");
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* COGL_USE_PREMULT_SSE2 */
|
|
|
|
|
2012-03-01 13:55:39 +00:00
|
|
|
static void
|
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 20:56:40 +00:00
|
|
|
_cogl_bitmap_premult_unpacked_span_uint8_t (uint8_t *data,
|
2012-03-01 13:55:39 +00:00
|
|
|
int width)
|
|
|
|
{
|
|
|
|
#ifdef COGL_USE_PREMULT_SSE2
|
|
|
|
|
|
|
|
/* Process 4 pixels at a time */
|
|
|
|
while (width >= 4)
|
|
|
|
{
|
|
|
|
_cogl_premult_alpha_last_four_pixels_sse2 (data);
|
|
|
|
data += 4 * 4;
|
|
|
|
width -= 4;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If there are any pixels left we will fall through and
|
|
|
|
handle them below */
|
|
|
|
|
|
|
|
#endif /* COGL_USE_PREMULT_SSE2 */
|
|
|
|
|
|
|
|
while (width-- > 0)
|
|
|
|
{
|
|
|
|
_cogl_premult_alpha_last (data);
|
|
|
|
data += 4;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
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 20:56:40 +00:00
|
|
|
_cogl_bitmap_unpremult_unpacked_span_uint8_t (uint8_t *data,
|
2012-03-01 13:55:39 +00:00
|
|
|
int width)
|
|
|
|
{
|
|
|
|
int x;
|
|
|
|
|
|
|
|
for (x = 0; x < width; x++)
|
|
|
|
{
|
|
|
|
if (data[3] == 0)
|
|
|
|
_cogl_unpremult_alpha_0 (data);
|
|
|
|
else
|
|
|
|
_cogl_unpremult_alpha_last (data);
|
|
|
|
data += 4;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
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 20:56:40 +00:00
|
|
|
_cogl_bitmap_unpremult_unpacked_span_uint16_t (uint16_t *data,
|
2012-03-01 13:55:39 +00:00
|
|
|
int width)
|
|
|
|
{
|
|
|
|
while (width-- > 0)
|
|
|
|
{
|
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 20:56:40 +00:00
|
|
|
uint16_t alpha = data[3];
|
2012-03-01 13:55:39 +00:00
|
|
|
|
|
|
|
if (alpha == 0)
|
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 20:56:40 +00:00
|
|
|
memset (data, 0, sizeof (uint16_t) * 3);
|
2012-03-01 13:55:39 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
data[0] = (data[0] * 65535) / alpha;
|
|
|
|
data[1] = (data[1] * 65535) / alpha;
|
|
|
|
data[2] = (data[2] * 65535) / alpha;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
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 20:56:40 +00:00
|
|
|
_cogl_bitmap_premult_unpacked_span_uint16_t (uint16_t *data,
|
2012-03-01 13:55:39 +00:00
|
|
|
int width)
|
|
|
|
{
|
|
|
|
while (width-- > 0)
|
|
|
|
{
|
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 20:56:40 +00:00
|
|
|
uint16_t alpha = data[3];
|
2012-03-01 13:55:39 +00:00
|
|
|
|
|
|
|
data[0] = (data[0] * alpha) / 65535;
|
|
|
|
data[1] = (data[1] * alpha) / 65535;
|
|
|
|
data[2] = (data[2] * alpha) / 65535;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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 20:56:40 +00:00
|
|
|
static CoglBool
|
2012-03-02 18:03:02 +00:00
|
|
|
_cogl_bitmap_can_fast_premult (CoglPixelFormat format)
|
2008-04-25 13:37:36 +00:00
|
|
|
{
|
2012-02-29 15:16:27 +00:00
|
|
|
switch (format & ~COGL_PREMULT_BIT)
|
2008-04-25 13:37:36 +00:00
|
|
|
{
|
2012-02-13 23:55:01 +00:00
|
|
|
case COGL_PIXEL_FORMAT_RGBA_8888:
|
|
|
|
case COGL_PIXEL_FORMAT_BGRA_8888:
|
|
|
|
case COGL_PIXEL_FORMAT_ARGB_8888:
|
|
|
|
case COGL_PIXEL_FORMAT_ABGR_8888:
|
|
|
|
return TRUE;
|
2009-04-27 14:48:12 +00:00
|
|
|
|
2008-04-25 13:37:36 +00:00
|
|
|
default:
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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 20:56:40 +00:00
|
|
|
static CoglBool
|
2012-02-29 15:16:27 +00:00
|
|
|
_cogl_bitmap_needs_short_temp_buffer (CoglPixelFormat format)
|
2009-05-09 18:39:01 +00:00
|
|
|
{
|
2012-02-29 15:16:27 +00:00
|
|
|
/* If the format is using more than 8 bits per component then we'll
|
|
|
|
unpack into a 16-bit per component buffer instead of 8-bit so we
|
|
|
|
won't lose as much precision. If we ever add support for formats
|
|
|
|
with more than 16 bits for at least one of the components then we
|
|
|
|
should probably do something else here, maybe convert to
|
|
|
|
floats */
|
|
|
|
switch (format)
|
2012-02-13 23:55:01 +00:00
|
|
|
{
|
2012-02-29 15:16:27 +00:00
|
|
|
case COGL_PIXEL_FORMAT_ANY:
|
|
|
|
case COGL_PIXEL_FORMAT_YUV:
|
|
|
|
g_assert_not_reached ();
|
|
|
|
|
|
|
|
case COGL_PIXEL_FORMAT_A_8:
|
|
|
|
case COGL_PIXEL_FORMAT_RGB_565:
|
|
|
|
case COGL_PIXEL_FORMAT_RGBA_4444:
|
|
|
|
case COGL_PIXEL_FORMAT_RGBA_5551:
|
|
|
|
case COGL_PIXEL_FORMAT_G_8:
|
|
|
|
case COGL_PIXEL_FORMAT_RGB_888:
|
|
|
|
case COGL_PIXEL_FORMAT_BGR_888:
|
2012-02-13 23:55:01 +00:00
|
|
|
case COGL_PIXEL_FORMAT_RGBA_8888:
|
|
|
|
case COGL_PIXEL_FORMAT_BGRA_8888:
|
|
|
|
case COGL_PIXEL_FORMAT_ARGB_8888:
|
|
|
|
case COGL_PIXEL_FORMAT_ABGR_8888:
|
2012-02-29 15:16:27 +00:00
|
|
|
case COGL_PIXEL_FORMAT_RGBA_8888_PRE:
|
|
|
|
case COGL_PIXEL_FORMAT_BGRA_8888_PRE:
|
|
|
|
case COGL_PIXEL_FORMAT_ARGB_8888_PRE:
|
|
|
|
case COGL_PIXEL_FORMAT_ABGR_8888_PRE:
|
|
|
|
case COGL_PIXEL_FORMAT_RGBA_4444_PRE:
|
|
|
|
case COGL_PIXEL_FORMAT_RGBA_5551_PRE:
|
2012-02-13 23:55:01 +00:00
|
|
|
return FALSE;
|
2012-02-29 15:16:27 +00:00
|
|
|
|
|
|
|
case COGL_PIXEL_FORMAT_RGBA_1010102:
|
|
|
|
case COGL_PIXEL_FORMAT_BGRA_1010102:
|
|
|
|
case COGL_PIXEL_FORMAT_ARGB_2101010:
|
|
|
|
case COGL_PIXEL_FORMAT_ABGR_2101010:
|
|
|
|
case COGL_PIXEL_FORMAT_RGBA_1010102_PRE:
|
|
|
|
case COGL_PIXEL_FORMAT_BGRA_1010102_PRE:
|
|
|
|
case COGL_PIXEL_FORMAT_ARGB_2101010_PRE:
|
|
|
|
case COGL_PIXEL_FORMAT_ABGR_2101010_PRE:
|
|
|
|
return TRUE;
|
2012-02-13 23:55:01 +00:00
|
|
|
}
|
2012-02-29 15:16:27 +00:00
|
|
|
|
|
|
|
g_assert_not_reached ();
|
2009-05-09 18:39:01 +00: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 20:56:40 +00:00
|
|
|
CoglBool
|
2012-03-01 14:44:41 +00:00
|
|
|
_cogl_bitmap_convert_into_bitmap (CoglBitmap *src_bmp,
|
|
|
|
CoglBitmap *dst_bmp)
|
2008-04-25 13:37:36 +00: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 20:56:40 +00:00
|
|
|
uint8_t *src_data;
|
|
|
|
uint8_t *dst_data;
|
|
|
|
uint8_t *src;
|
|
|
|
uint8_t *dst;
|
|
|
|
void *tmp_row;
|
|
|
|
int src_rowstride;
|
|
|
|
int dst_rowstride;
|
|
|
|
int y;
|
|
|
|
int width, height;
|
|
|
|
CoglPixelFormat src_format;
|
|
|
|
CoglPixelFormat dst_format;
|
|
|
|
CoglBool use_16;
|
|
|
|
CoglBool need_premult;
|
2010-07-07 17:44:16 +00:00
|
|
|
|
2012-02-25 20:18:05 +00:00
|
|
|
src_format = cogl_bitmap_get_format (src_bmp);
|
|
|
|
src_rowstride = cogl_bitmap_get_rowstride (src_bmp);
|
|
|
|
dst_format = cogl_bitmap_get_format (dst_bmp);
|
|
|
|
dst_rowstride = cogl_bitmap_get_rowstride (dst_bmp);
|
|
|
|
width = cogl_bitmap_get_width (src_bmp);
|
|
|
|
height = cogl_bitmap_get_height (src_bmp);
|
2009-04-27 14:48:12 +00:00
|
|
|
|
2012-02-25 20:18:05 +00:00
|
|
|
_COGL_RETURN_VAL_IF_FAIL (width == cogl_bitmap_get_width (dst_bmp), FALSE);
|
|
|
|
_COGL_RETURN_VAL_IF_FAIL (height == cogl_bitmap_get_height (dst_bmp), FALSE);
|
2012-03-01 14:44:41 +00:00
|
|
|
|
2012-03-01 13:55:39 +00:00
|
|
|
need_premult
|
|
|
|
= ((src_format & COGL_PREMULT_BIT) != (dst_format & COGL_PREMULT_BIT) &&
|
|
|
|
src_format != COGL_PIXEL_FORMAT_A_8 &&
|
|
|
|
dst_format != COGL_PIXEL_FORMAT_A_8 &&
|
|
|
|
(src_format & dst_format & COGL_A_BIT));
|
|
|
|
|
|
|
|
/* If the base format is the same then we can just copy the bitmap
|
|
|
|
instead */
|
|
|
|
if ((src_format & ~COGL_PREMULT_BIT) == (dst_format & ~COGL_PREMULT_BIT) &&
|
2012-03-02 18:03:02 +00:00
|
|
|
(!need_premult || _cogl_bitmap_can_fast_premult (dst_format)))
|
2012-03-01 13:55:39 +00:00
|
|
|
{
|
2012-03-01 14:44:41 +00:00
|
|
|
if (!_cogl_bitmap_copy_subregion (src_bmp, dst_bmp,
|
|
|
|
0, 0, /* src_x / src_y */
|
|
|
|
0, 0, /* dst_x / dst_y */
|
|
|
|
width, height))
|
|
|
|
return FALSE;
|
2012-03-01 13:55:39 +00:00
|
|
|
|
2012-03-01 14:44:41 +00:00
|
|
|
if (need_premult)
|
2012-03-01 13:55:39 +00:00
|
|
|
{
|
2012-03-01 14:44:41 +00:00
|
|
|
if ((dst_format & COGL_PREMULT_BIT))
|
|
|
|
{
|
|
|
|
if (!_cogl_bitmap_premult (dst_bmp))
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (!_cogl_bitmap_unpremult (dst_bmp))
|
|
|
|
return FALSE;
|
|
|
|
}
|
2012-03-01 13:55:39 +00:00
|
|
|
}
|
|
|
|
|
2012-03-01 14:44:41 +00:00
|
|
|
return TRUE;
|
2012-03-01 13:55:39 +00:00
|
|
|
}
|
|
|
|
|
2010-07-07 17:44:16 +00:00
|
|
|
src_data = _cogl_bitmap_map (src_bmp, COGL_BUFFER_ACCESS_READ, 0);
|
|
|
|
if (src_data == NULL)
|
2012-03-01 14:44:41 +00:00
|
|
|
return FALSE;
|
|
|
|
dst_data = _cogl_bitmap_map (dst_bmp,
|
|
|
|
COGL_BUFFER_ACCESS_WRITE,
|
|
|
|
COGL_BUFFER_MAP_HINT_DISCARD);
|
|
|
|
if (dst_data == NULL)
|
|
|
|
{
|
|
|
|
_cogl_bitmap_unmap (src_bmp);
|
|
|
|
return FALSE;
|
|
|
|
}
|
2010-07-07 17:44:16 +00:00
|
|
|
|
2012-02-29 15:16:27 +00:00
|
|
|
use_16 = _cogl_bitmap_needs_short_temp_buffer (dst_format);
|
|
|
|
|
2012-03-01 14:44:41 +00:00
|
|
|
/* Allocate a buffer to hold a temporary RGBA row */
|
2012-02-29 15:16:27 +00:00
|
|
|
tmp_row = g_malloc (width *
|
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 20:56:40 +00:00
|
|
|
(use_16 ? sizeof (uint16_t) : sizeof (uint8_t)) * 4);
|
2009-04-27 14:48:12 +00:00
|
|
|
|
2008-04-25 13:37:36 +00:00
|
|
|
/* FIXME: Optimize */
|
2010-07-07 17:44:16 +00:00
|
|
|
for (y = 0; y < height; y++)
|
2008-04-25 13:37:36 +00:00
|
|
|
{
|
2010-07-07 17:44:16 +00:00
|
|
|
src = src_data + y * src_rowstride;
|
|
|
|
dst = dst_data + y * dst_rowstride;
|
2009-04-27 14:48:12 +00:00
|
|
|
|
2012-02-29 15:16:27 +00:00
|
|
|
if (use_16)
|
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 20:56:40 +00:00
|
|
|
_cogl_unpack_uint16_t (src_format, src, tmp_row, width);
|
2012-02-29 15:16:27 +00:00
|
|
|
else
|
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 20:56:40 +00:00
|
|
|
_cogl_unpack_uint8_t (src_format, src, tmp_row, width);
|
2012-02-29 15:16:27 +00:00
|
|
|
|
2012-03-01 13:55:39 +00:00
|
|
|
/* Handle premultiplication */
|
|
|
|
if (need_premult)
|
|
|
|
{
|
|
|
|
if (dst_format & COGL_PREMULT_BIT)
|
|
|
|
{
|
|
|
|
if (use_16)
|
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 20:56:40 +00:00
|
|
|
_cogl_bitmap_premult_unpacked_span_uint16_t (tmp_row, width);
|
2012-03-01 13:55:39 +00:00
|
|
|
else
|
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 20:56:40 +00:00
|
|
|
_cogl_bitmap_premult_unpacked_span_uint8_t (tmp_row, width);
|
2012-03-01 13:55:39 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (use_16)
|
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 20:56:40 +00:00
|
|
|
_cogl_bitmap_unpremult_unpacked_span_uint16_t (tmp_row, width);
|
2012-03-01 13:55:39 +00:00
|
|
|
else
|
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 20:56:40 +00:00
|
|
|
_cogl_bitmap_unpremult_unpacked_span_uint8_t (tmp_row, width);
|
2012-03-01 13:55:39 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-02-29 15:16:27 +00:00
|
|
|
if (use_16)
|
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 20:56:40 +00:00
|
|
|
_cogl_pack_uint16_t (dst_format, tmp_row, dst, width);
|
2012-02-29 15:16:27 +00:00
|
|
|
else
|
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 20:56:40 +00:00
|
|
|
_cogl_pack_uint8_t (dst_format, tmp_row, dst, width);
|
2008-04-25 13:37:36 +00:00
|
|
|
}
|
2009-04-27 14:48:12 +00:00
|
|
|
|
2010-07-07 17:44:16 +00:00
|
|
|
_cogl_bitmap_unmap (src_bmp);
|
2012-03-01 14:44:41 +00:00
|
|
|
_cogl_bitmap_unmap (dst_bmp);
|
2010-07-07 17:44:16 +00:00
|
|
|
|
2012-02-29 15:16:27 +00:00
|
|
|
g_free (tmp_row);
|
|
|
|
|
2012-03-01 14:44:41 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
CoglBitmap *
|
|
|
|
_cogl_bitmap_convert (CoglBitmap *src_bmp,
|
|
|
|
CoglPixelFormat dst_format)
|
|
|
|
{
|
|
|
|
CoglBitmap *dst_bmp;
|
|
|
|
int width, height;
|
|
|
|
|
2012-03-13 14:46:18 +00:00
|
|
|
_COGL_GET_CONTEXT (ctx, NULL);
|
|
|
|
|
2012-02-25 20:18:05 +00:00
|
|
|
width = cogl_bitmap_get_width (src_bmp);
|
|
|
|
height = cogl_bitmap_get_height (src_bmp);
|
2012-03-13 14:46:18 +00:00
|
|
|
|
|
|
|
dst_bmp = _cogl_bitmap_new_with_malloc_buffer (ctx,
|
|
|
|
width, height,
|
|
|
|
dst_format);
|
2012-03-01 14:44:41 +00:00
|
|
|
|
|
|
|
if (!_cogl_bitmap_convert_into_bitmap (src_bmp, dst_bmp))
|
|
|
|
{
|
|
|
|
cogl_object_unref (dst_bmp);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return dst_bmp;
|
2008-04-25 13:37:36 +00: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 20:56:40 +00:00
|
|
|
CoglBool
|
2012-03-01 13:14:10 +00:00
|
|
|
_cogl_bitmap_unpremult (CoglBitmap *bmp)
|
2008-04-25 13:37:36 +00: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 20:56:40 +00:00
|
|
|
uint8_t *p, *data;
|
|
|
|
uint16_t *tmp_row;
|
|
|
|
int x,y;
|
|
|
|
CoglPixelFormat format;
|
|
|
|
int width, height;
|
|
|
|
int rowstride;
|
2010-07-07 17:44:16 +00:00
|
|
|
|
2012-02-25 20:18:05 +00:00
|
|
|
format = cogl_bitmap_get_format (bmp);
|
|
|
|
width = cogl_bitmap_get_width (bmp);
|
|
|
|
height = cogl_bitmap_get_height (bmp);
|
|
|
|
rowstride = cogl_bitmap_get_rowstride (bmp);
|
2009-04-27 14:48:12 +00:00
|
|
|
|
2010-07-07 17:44:16 +00:00
|
|
|
if ((data = _cogl_bitmap_map (bmp,
|
|
|
|
COGL_BUFFER_ACCESS_READ |
|
|
|
|
COGL_BUFFER_ACCESS_WRITE,
|
|
|
|
0)) == NULL)
|
2008-04-25 13:37:36 +00:00
|
|
|
return FALSE;
|
2009-04-27 14:48:12 +00:00
|
|
|
|
2012-03-02 18:03:02 +00:00
|
|
|
/* If we can't directly unpremult the data inline then we'll
|
|
|
|
allocate a temporary row and unpack the data. This assumes if we
|
|
|
|
can fast premult then we can also fast unpremult */
|
|
|
|
if (_cogl_bitmap_can_fast_premult (format))
|
|
|
|
tmp_row = NULL;
|
|
|
|
else
|
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 20:56:40 +00:00
|
|
|
tmp_row = g_malloc (sizeof (uint16_t) * 4 * width);
|
2012-03-02 18:03:02 +00:00
|
|
|
|
2010-07-07 17:44:16 +00:00
|
|
|
for (y = 0; y < height; y++)
|
2008-04-25 13:37:36 +00: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 20:56:40 +00:00
|
|
|
p = (uint8_t*) data + y * rowstride;
|
2009-04-27 14:48:12 +00:00
|
|
|
|
2012-03-02 18:03:02 +00:00
|
|
|
if (tmp_row)
|
|
|
|
{
|
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 20:56:40 +00:00
|
|
|
_cogl_unpack_uint16_t (format, p, tmp_row, width);
|
|
|
|
_cogl_bitmap_unpremult_unpacked_span_uint16_t (tmp_row, width);
|
|
|
|
_cogl_pack_uint16_t (format, tmp_row, p, width);
|
2012-03-02 18:03:02 +00:00
|
|
|
}
|
|
|
|
else
|
2009-06-07 14:58:56 +00:00
|
|
|
{
|
2012-03-02 18:03:02 +00:00
|
|
|
if (format & COGL_AFIRST_BIT)
|
2009-06-07 14:58:56 +00:00
|
|
|
{
|
2012-03-02 18:03:02 +00:00
|
|
|
for (x = 0; x < width; x++)
|
|
|
|
{
|
|
|
|
if (p[0] == 0)
|
|
|
|
_cogl_unpremult_alpha_0 (p);
|
|
|
|
else
|
|
|
|
_cogl_unpremult_alpha_first (p);
|
|
|
|
p += 4;
|
|
|
|
}
|
2009-06-07 14:58:56 +00:00
|
|
|
}
|
2012-03-02 18:03:02 +00:00
|
|
|
else
|
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 20:56:40 +00:00
|
|
|
_cogl_bitmap_unpremult_unpacked_span_uint8_t (p, width);
|
2009-06-07 14:58:56 +00:00
|
|
|
}
|
2008-04-25 13:37:36 +00:00
|
|
|
}
|
2009-04-27 14:48:12 +00:00
|
|
|
|
2012-03-02 18:03:02 +00:00
|
|
|
g_free (tmp_row);
|
|
|
|
|
2010-07-07 17:44:16 +00:00
|
|
|
_cogl_bitmap_unmap (bmp);
|
|
|
|
|
|
|
|
_cogl_bitmap_set_format (bmp, format & ~COGL_PREMULT_BIT);
|
2010-02-06 00:12:10 +00:00
|
|
|
|
2008-04-25 13:37:36 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
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 20:56:40 +00:00
|
|
|
CoglBool
|
2012-03-01 13:14:10 +00:00
|
|
|
_cogl_bitmap_premult (CoglBitmap *bmp)
|
2009-05-09 18:39:01 +00: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 20:56:40 +00:00
|
|
|
uint8_t *p, *data;
|
|
|
|
uint16_t *tmp_row;
|
|
|
|
int x,y;
|
|
|
|
CoglPixelFormat format;
|
|
|
|
int width, height;
|
|
|
|
int rowstride;
|
2010-07-07 17:44:16 +00:00
|
|
|
|
2012-02-25 20:18:05 +00:00
|
|
|
format = cogl_bitmap_get_format (bmp);
|
|
|
|
width = cogl_bitmap_get_width (bmp);
|
|
|
|
height = cogl_bitmap_get_height (bmp);
|
|
|
|
rowstride = cogl_bitmap_get_rowstride (bmp);
|
2009-05-09 18:39:01 +00:00
|
|
|
|
2010-07-07 17:44:16 +00:00
|
|
|
if ((data = _cogl_bitmap_map (bmp,
|
|
|
|
COGL_BUFFER_ACCESS_READ |
|
|
|
|
COGL_BUFFER_ACCESS_WRITE,
|
|
|
|
0)) == NULL)
|
|
|
|
return FALSE;
|
|
|
|
|
2012-03-02 18:03:02 +00:00
|
|
|
/* If we can't directly premult the data inline then we'll allocate
|
|
|
|
a temporary row and unpack the data. */
|
|
|
|
if (_cogl_bitmap_can_fast_premult (format))
|
|
|
|
tmp_row = NULL;
|
|
|
|
else
|
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 20:56:40 +00:00
|
|
|
tmp_row = g_malloc (sizeof (uint16_t) * 4 * width);
|
2012-03-02 18:03:02 +00:00
|
|
|
|
2010-07-07 17:44:16 +00:00
|
|
|
for (y = 0; y < height; y++)
|
2009-05-09 18:39:01 +00: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 20:56:40 +00:00
|
|
|
p = (uint8_t*) data + y * rowstride;
|
2009-05-09 18:39:01 +00:00
|
|
|
|
2012-03-02 18:03:02 +00:00
|
|
|
if (tmp_row)
|
|
|
|
{
|
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 20:56:40 +00:00
|
|
|
_cogl_unpack_uint16_t (format, p, tmp_row, width);
|
|
|
|
_cogl_bitmap_premult_unpacked_span_uint16_t (tmp_row, width);
|
|
|
|
_cogl_pack_uint16_t (format, tmp_row, p, width);
|
2012-03-02 18:03:02 +00:00
|
|
|
}
|
|
|
|
else
|
2010-01-29 15:15:08 +00:00
|
|
|
{
|
2012-03-02 18:03:02 +00:00
|
|
|
if (format & COGL_AFIRST_BIT)
|
2010-01-29 15:15:08 +00:00
|
|
|
{
|
2012-03-02 18:03:02 +00:00
|
|
|
for (x = 0; x < width; x++)
|
|
|
|
{
|
|
|
|
_cogl_premult_alpha_first (p);
|
|
|
|
p += 4;
|
|
|
|
}
|
2010-01-29 15:15:08 +00:00
|
|
|
}
|
2012-03-02 18:03:02 +00:00
|
|
|
else
|
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 20:56:40 +00:00
|
|
|
_cogl_bitmap_premult_unpacked_span_uint8_t (p, width);
|
2010-01-29 15:15:08 +00:00
|
|
|
}
|
2009-05-09 18:39:01 +00:00
|
|
|
}
|
|
|
|
|
2012-03-02 18:03:02 +00:00
|
|
|
g_free (tmp_row);
|
|
|
|
|
2010-07-07 17:44:16 +00:00
|
|
|
_cogl_bitmap_unmap (bmp);
|
|
|
|
|
|
|
|
_cogl_bitmap_set_format (bmp, format | COGL_PREMULT_BIT);
|
2010-02-06 00:12:10 +00:00
|
|
|
|
2009-05-09 18:39:01 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|