cogl: Move Color struct definition where it belongs
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3895>
This commit is contained in:
parent
028df43012
commit
1acfa6def3
2 changed files with 15 additions and 18 deletions
|
@ -34,6 +34,13 @@
|
|||
#error "Only <cogl/cogl.h> can be included directly."
|
||||
#endif
|
||||
|
||||
#include "cogl/cogl-types.h"
|
||||
#include "cogl/cogl-macros.h"
|
||||
|
||||
#include <glib-object.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
/**
|
||||
* CoglColor:
|
||||
*
|
||||
|
@ -42,14 +49,14 @@
|
|||
* #CoglColor is a simple structure holding the definition of a color such
|
||||
* that it can be efficiently used by GL
|
||||
*/
|
||||
struct _CoglColor
|
||||
{
|
||||
uint8_t red;
|
||||
uint8_t green;
|
||||
uint8_t blue;
|
||||
|
||||
#include "cogl/cogl-types.h"
|
||||
#include "cogl/cogl-macros.h"
|
||||
|
||||
#include <glib-object.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
uint8_t alpha;
|
||||
};
|
||||
/**
|
||||
* COGL_COLOR_INIT:
|
||||
* @r: value for the red channel, between 0 and 255
|
||||
|
|
|
@ -56,9 +56,8 @@ G_BEGIN_DECLS
|
|||
#define COGL_PRIVATE(x) private_member_ ## x
|
||||
#endif
|
||||
|
||||
typedef struct _CoglFramebuffer CoglFramebuffer;
|
||||
|
||||
typedef struct _CoglColor CoglColor;
|
||||
typedef struct _CoglFramebuffer CoglFramebuffer;
|
||||
|
||||
/**
|
||||
* CoglDmaBufHandle: (free-func cogl_dma_buf_handle_free)
|
||||
|
@ -68,15 +67,6 @@ typedef struct _CoglColor CoglColor;
|
|||
*/
|
||||
typedef struct _CoglDmaBufHandle CoglDmaBufHandle;
|
||||
|
||||
struct _CoglColor
|
||||
{
|
||||
uint8_t red;
|
||||
uint8_t green;
|
||||
uint8_t blue;
|
||||
|
||||
uint8_t alpha;
|
||||
};
|
||||
|
||||
/**
|
||||
* COGL_BLEND_STRING_ERROR:
|
||||
*
|
||||
|
|
Loading…
Reference in a new issue