185630085c
This option to GCC makes it give a warning whenever a global function is defined without a declaration. This should catch cases were we've defined a function but forgot to put it in a header. In that case it is either only used within one file so we should make it static or we should declare it in a header. The following changes where made to fix problems: • Some functions were made static • cogl-path.h (the one containing the 1.0 API) was split into two files, one defining the functions and one defining the enums so that cogl-path.c can include the enum and function declarations from the 2.0 API as well as the function declarations from the 1.0 API. • cogl2-clip-state has been removed. This only had one experimental function called cogl_clip_push_from_path but as this is unstable we might as well remove it favour of the equivalent cogl_framebuffer_* API. • The GLX, SDL and WGL winsys's now have a private header to define their get_vtable function instead of directly declaring in the C file where it is called. • All places that were calling COGL_OBJECT_DEFINE need to have the cogl_is_whatever function declared so these have been added either as a public function or in a private header. • Some files that were not including the header containing their function declarations have been fixed to do so. • Any unused error quark functions have been removed. If we later want them we should add them back one by one and add a declaration for them in a header. • _cogl_is_framebuffer has been renamed to cogl_is_framebuffer and made a public function with a declaration in cogl-framebuffer.h • Similarly for CoglOnscreen. • cogl_vdraw_indexed_attributes is called cogl_framebuffer_vdraw_indexed_attributes in the header. The definition has been changed to match the header. • cogl_index_buffer_allocate has been removed. This had no declaration and I'm not sure what it's supposed to do. • CoglJournal has been changed to use the internal CoglObject macro so that it won't define an exported cogl_is_journal symbol. • The _cogl_blah_pointer_from_handle functions have been removed. CoglHandle isn't used much anymore anyway and in the few places where it is used I think it's safe to just use the implicit cast from void* to the right type. • The test-utils.h header for the conformance tests explicitly disables the -Wmissing-declaration option using a pragma because all of the tests declare their main function without a header. Any mistakes relating to missing declarations aren't really important for the tests. • cogl_quaternion_init_from_quaternion and init_from_matrix have been given declarations in cogl-quaternion.h Reviewed-by: Robert Bragg <robert@linux.intel.com>
315 lines
6.4 KiB
C
315 lines
6.4 KiB
C
/*
|
|
* Cogl
|
|
*
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
|
*
|
|
* Copyright (C) 2008,2009 Intel Corporation.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
*
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include <string.h>
|
|
|
|
#include "cogl-util.h"
|
|
#include "cogl-color.h"
|
|
#include "cogl-fixed.h"
|
|
#include "cogl-color-private.h"
|
|
|
|
CoglColor *
|
|
cogl_color_new (void)
|
|
{
|
|
return g_slice_new (CoglColor);
|
|
}
|
|
|
|
CoglColor *
|
|
cogl_color_copy (const CoglColor *color)
|
|
{
|
|
if (G_LIKELY (color))
|
|
return g_slice_dup (CoglColor, color);
|
|
|
|
return NULL;
|
|
}
|
|
|
|
void
|
|
cogl_color_free (CoglColor *color)
|
|
{
|
|
if (G_LIKELY (color))
|
|
g_slice_free (CoglColor, color);
|
|
}
|
|
|
|
void
|
|
cogl_color_init_from_4ub (CoglColor *color,
|
|
guint8 red,
|
|
guint8 green,
|
|
guint8 blue,
|
|
guint8 alpha)
|
|
{
|
|
_COGL_RETURN_IF_FAIL (color != NULL);
|
|
|
|
color->red = red;
|
|
color->green = green;
|
|
color->blue = blue;
|
|
color->alpha = alpha;
|
|
}
|
|
|
|
/* XXX: deprecated, use cogl_color_init_from_4ub */
|
|
void
|
|
cogl_color_set_from_4ub (CoglColor *dest,
|
|
guint8 red,
|
|
guint8 green,
|
|
guint8 blue,
|
|
guint8 alpha)
|
|
{
|
|
cogl_color_init_from_4ub (dest, red, green, blue, alpha);
|
|
}
|
|
|
|
void
|
|
cogl_color_init_from_4f (CoglColor *color,
|
|
float red,
|
|
float green,
|
|
float blue,
|
|
float alpha)
|
|
{
|
|
_COGL_RETURN_IF_FAIL (color != NULL);
|
|
|
|
color->red = (red * 255);
|
|
color->green = (green * 255);
|
|
color->blue = (blue * 255);
|
|
color->alpha = (alpha * 255);
|
|
}
|
|
|
|
/* XXX: deprecated, use cogl_color_init_from_4f */
|
|
void
|
|
cogl_color_set_from_4f (CoglColor *color,
|
|
float red,
|
|
float green,
|
|
float blue,
|
|
float alpha)
|
|
{
|
|
cogl_color_init_from_4f (color, red, green, blue, alpha);
|
|
}
|
|
|
|
void
|
|
cogl_color_init_from_4fv (CoglColor *color,
|
|
float *color_array)
|
|
{
|
|
_COGL_RETURN_IF_FAIL (color != NULL);
|
|
|
|
color->red = (color_array[0] * 255);
|
|
color->green = (color_array[1] * 255);
|
|
color->blue = (color_array[2] * 255);
|
|
color->alpha = (color_array[3] * 255);
|
|
}
|
|
|
|
unsigned char
|
|
cogl_color_get_red_byte (const CoglColor *color)
|
|
{
|
|
return color->red;
|
|
}
|
|
|
|
float
|
|
cogl_color_get_red_float (const CoglColor *color)
|
|
{
|
|
return (float) color->red / 255.0;
|
|
}
|
|
|
|
float
|
|
cogl_color_get_red (const CoglColor *color)
|
|
{
|
|
return ((float) color->red / 255.0);
|
|
}
|
|
|
|
unsigned char
|
|
cogl_color_get_green_byte (const CoglColor *color)
|
|
{
|
|
return color->green;
|
|
}
|
|
|
|
float
|
|
cogl_color_get_green_float (const CoglColor *color)
|
|
{
|
|
return (float) color->green / 255.0;
|
|
}
|
|
|
|
float
|
|
cogl_color_get_green (const CoglColor *color)
|
|
{
|
|
return ((float) color->green / 255.0);
|
|
}
|
|
|
|
unsigned char
|
|
cogl_color_get_blue_byte (const CoglColor *color)
|
|
{
|
|
return color->blue;
|
|
}
|
|
|
|
float
|
|
cogl_color_get_blue_float (const CoglColor *color)
|
|
{
|
|
return (float) color->blue / 255.0;
|
|
}
|
|
|
|
float
|
|
cogl_color_get_blue (const CoglColor *color)
|
|
{
|
|
return ((float) color->blue / 255.0);
|
|
}
|
|
|
|
unsigned char
|
|
cogl_color_get_alpha_byte (const CoglColor *color)
|
|
{
|
|
return color->alpha;
|
|
}
|
|
|
|
float
|
|
cogl_color_get_alpha_float (const CoglColor *color)
|
|
{
|
|
return (float) color->alpha / 255.0;
|
|
}
|
|
|
|
float
|
|
cogl_color_get_alpha (const CoglColor *color)
|
|
{
|
|
return ((float) color->alpha / 255.0);
|
|
}
|
|
|
|
void
|
|
cogl_color_set_red_byte (CoglColor *color,
|
|
unsigned char red)
|
|
{
|
|
color->red = red;
|
|
}
|
|
|
|
void
|
|
cogl_color_set_red_float (CoglColor *color,
|
|
float red)
|
|
{
|
|
color->red = red * 255.0;
|
|
}
|
|
|
|
void
|
|
cogl_color_set_red (CoglColor *color,
|
|
float red)
|
|
{
|
|
color->red = red * 255.0;
|
|
}
|
|
|
|
void
|
|
cogl_color_set_green_byte (CoglColor *color,
|
|
unsigned char green)
|
|
{
|
|
color->green = green;
|
|
}
|
|
|
|
void
|
|
cogl_color_set_green_float (CoglColor *color,
|
|
float green)
|
|
{
|
|
color->green = green * 255.0;
|
|
}
|
|
|
|
void
|
|
cogl_color_set_green (CoglColor *color,
|
|
float green)
|
|
{
|
|
color->green = green * 255.0;
|
|
}
|
|
|
|
void
|
|
cogl_color_set_blue_byte (CoglColor *color,
|
|
unsigned char blue)
|
|
{
|
|
color->blue = blue;
|
|
}
|
|
|
|
void
|
|
cogl_color_set_blue_float (CoglColor *color,
|
|
float blue)
|
|
{
|
|
color->blue = blue * 255.0;
|
|
}
|
|
|
|
void
|
|
cogl_color_set_blue (CoglColor *color,
|
|
float blue)
|
|
{
|
|
color->blue = blue * 255.0;
|
|
}
|
|
|
|
void
|
|
cogl_color_set_alpha_byte (CoglColor *color,
|
|
unsigned char alpha)
|
|
{
|
|
color->alpha = alpha;
|
|
}
|
|
|
|
void
|
|
cogl_color_set_alpha_float (CoglColor *color,
|
|
float alpha)
|
|
{
|
|
color->alpha = alpha * 255.0;
|
|
}
|
|
|
|
void
|
|
cogl_color_set_alpha (CoglColor *color,
|
|
float alpha)
|
|
{
|
|
color->alpha = alpha * 255.0;
|
|
}
|
|
|
|
void
|
|
cogl_color_premultiply (CoglColor *color)
|
|
{
|
|
color->red = (color->red * color->alpha + 128) / 255;
|
|
color->green = (color->green * color->alpha + 128) / 255;
|
|
color->blue = (color->blue * color->alpha + 128) / 255;
|
|
}
|
|
|
|
void
|
|
cogl_color_unpremultiply (CoglColor *color)
|
|
{
|
|
if (color->alpha != 0)
|
|
{
|
|
color->red = (color->red * 255) / color->alpha;
|
|
color->green = (color->green * 255) / color->alpha;
|
|
color->blue = (color->blue * 255) / color->alpha;
|
|
}
|
|
}
|
|
|
|
gboolean
|
|
cogl_color_equal (gconstpointer v1, gconstpointer v2)
|
|
{
|
|
const guint32 *c1 = v1, *c2 = v2;
|
|
|
|
_COGL_RETURN_VAL_IF_FAIL (v1 != NULL, FALSE);
|
|
_COGL_RETURN_VAL_IF_FAIL (v2 != NULL, FALSE);
|
|
|
|
/* XXX: We don't compare the padding */
|
|
return *c1 == *c2 ? TRUE : FALSE;
|
|
}
|
|
|
|
void
|
|
_cogl_color_get_rgba_4ubv (const CoglColor *color,
|
|
guint8 *dest)
|
|
{
|
|
memcpy (dest, color, 4);
|
|
}
|
|
|