isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-16 13:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

cogl: Remove deprecated cogl_color_set_from_*

Browse Source 
https://gitlab.gnome.org/GNOME/mutter/merge_requests/933
This commit is contained in:
Adam Jackson 2019-10-29 15:02:33 -04:00
parent e5af790acb
commit 794d3239c7
5 changed files with 7 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clutter/clutter/clutter-actor.c
View File

@ -3429,11 +3429,11 @@ _clutter_actor_draw_paint_volume_full (ClutterActor *self,
n_vertices, n_vertices,
(CoglVertexP3 *)line_ends); (CoglVertexP3 *)line_ends);
cogl_color_set_from_4ub (&cogl_color, cogl_color_init_from_4ub (&cogl_color,
color->red, color->red,
color->green, color->green,
color->blue, color->blue,
color->alpha); color->alpha);
cogl_pipeline_set_color (outline, &cogl_color); cogl_pipeline_set_color (outline, &cogl_color);
pipeline_node = clutter_pipeline_node_new (outline); pipeline_node = clutter_pipeline_node_new (outline);

22
cogl/cogl/cogl-color.c
View File

@ -76,17 +76,6 @@ cogl_color_init_from_4ub (CoglColor *color,
color->alpha = alpha; color->alpha = alpha;
} }
/* XXX: deprecated, use cogl_color_init_from_4ub */
void
cogl_color_set_from_4ub (CoglColor *dest,
uint8_t red,
uint8_t green,
uint8_t blue,
uint8_t alpha)
{
cogl_color_init_from_4ub (dest, red, green, blue, alpha);
}
void void
cogl_color_init_from_4f (CoglColor *color, cogl_color_init_from_4f (CoglColor *color,
float red, float red,
@ -102,17 +91,6 @@ cogl_color_init_from_4f (CoglColor *color,
color->alpha = (alpha * 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 void
cogl_color_init_from_4fv (CoglColor *color, cogl_color_init_from_4fv (CoglColor *color,
const float *color_array) const float *color_array)

42
cogl/cogl/cogl-color.h
View File

@ -116,27 +116,6 @@ cogl_color_init_from_4ub (CoglColor *color,
uint8_t blue, uint8_t blue,
uint8_t alpha); uint8_t alpha);
/**
* cogl_color_set_from_4ub:
* @color: A pointer to a #CoglColor to initialize
* @red: value of the red channel, between 0 and 255
* @green: value of the green channel, between 0 and 255
* @blue: value of the blue channel, between 0 and 255
* @alpha: value of the alpha channel, between 0 and 255
*
* Sets the values of the passed channels into a #CoglColor.
*
* Since: 1.0
* Deprecated: 1.4: Use cogl_color_init_from_4ub instead.
*/
COGL_DEPRECATED_FOR (cogl_color_init_from_4ub)
void
cogl_color_set_from_4ub (CoglColor *color,
uint8_t red,
uint8_t green,
uint8_t blue,
uint8_t alpha);
/** /**
* cogl_color_init_from_4f: * cogl_color_init_from_4f:
* @color: A pointer to a #CoglColor to initialize * @color: A pointer to a #CoglColor to initialize
@ -156,27 +135,6 @@ cogl_color_init_from_4f (CoglColor *color,
float blue, float blue,
float alpha); float alpha);
/**
* cogl_color_set_from_4f:
* @color: A pointer to a #CoglColor to initialize
* @red: value of the red channel, between 0 and %1.0
* @green: value of the green channel, between 0 and %1.0
* @blue: value of the blue channel, between 0 and %1.0
* @alpha: value of the alpha channel, between 0 and %1.0
*
* Sets the values of the passed channels into a #CoglColor
*
* Since: 1.0
* Deprecated: 1.4: Use cogl_color_init_from_4f instead.
*/
COGL_DEPRECATED_FOR (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_4fv: * cogl_color_init_from_4fv:
* @color: A pointer to a #CoglColor to initialize * @color: A pointer to a #CoglColor to initialize

2
cogl/cogl/cogl.symbols
View File

@ -138,8 +138,6 @@ cogl_color_set_alpha_float
cogl_color_set_blue cogl_color_set_blue
cogl_color_set_blue_byte cogl_color_set_blue_byte
cogl_color_set_blue_float cogl_color_set_blue_float
cogl_color_set_from_4f
cogl_color_set_from_4ub
cogl_color_set_green cogl_color_set_green
cogl_color_set_green_byte cogl_color_set_green_byte
cogl_color_set_green_float cogl_color_set_green_float

4
cogl/tests/conform/test-just-vertex-shader.c
View File

@ -40,7 +40,7 @@ paint_legacy (TestState *state)
cogl_clear (&color, COGL_BUFFER_BIT_COLOR); cogl_clear (&color, COGL_BUFFER_BIT_COLOR);
/* Set the primary vertex color as red */ /* Set the primary vertex color as red */
cogl_color_set_from_4ub (&color, 0xff, 0x00, 0x00, 0xff); cogl_color_init_from_4ub (&color, 0xff, 0x00, 0x00, 0xff);
cogl_material_set_color (material, &color); cogl_material_set_color (material, &color);
/* Override the vertex color in the texture environment with a /* Override the vertex color in the texture environment with a
@ -110,7 +110,7 @@ paint (TestState *state)
cogl_clear (&color, COGL_BUFFER_BIT_COLOR); cogl_clear (&color, COGL_BUFFER_BIT_COLOR);
/* Set the primary vertex color as red */ /* Set the primary vertex color as red */
cogl_color_set_from_4ub (&color, 0xff, 0x00, 0x00, 0xff); cogl_color_init_from_4ub (&color, 0xff, 0x00, 0x00, 0xff);
cogl_pipeline_set_color (pipeline, &color); cogl_pipeline_set_color (pipeline, &color);
/* Override the vertex color in the texture environment with a /* Override the vertex color in the texture environment with a