brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[cogl] Make the blend string error domain public

Browse Source 
The error domain and codes must present in a publicly installed header
otherwise they won't be usable to match a GError.
This commit is contained in:
Emmanuele Bassi 2009-07-20 12:47:53 +01:00
parent e1e8c76ad7
commit cdb239756b
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clutter/cogl/cogl-types.h
View File

@ -295,6 +295,17 @@ typedef enum {
COGL_FOG_MODE_EXPONENTIAL_SQUARED
} CoglFogMode;
#define COGL_BLEND_STRING_ERROR (cogl_blend_string_error_quark ())
typedef enum { /*< prefix=COGL_BLEND_STRING_ERROR >*/
COGL_BLEND_STRING_ERROR_PARSE_ERROR,
COGL_BLEND_STRING_ERROR_ARGUMENT_PARSE_ERROR,
COGL_BLEND_STRING_ERROR_INVALID_ERROR,
COGL_BLEND_STRING_ERROR_GPU_UNSUPPORTED_ERROR
} CoglBlendStringError;
GQuark cogl_blend_string_error_quark (void);
G_END_DECLS
#endif /* __COGL_TYPES_H__ */

2
clutter/cogl/common/cogl-blend-string.c
View File

@ -122,7 +122,7 @@ static CoglBlendStringFunctionInfo blend_functions[] = {
#undef DEFINE_FUNCTION
GQuark
_cogl_blend_string_error_quark (void)
cogl_blend_string_error_quark (void)
{
return g_quark_from_static_string ("cogl-blend-string-error-quark");
}

13
clutter/cogl/common/cogl-blend-string.h
View File

@ -36,16 +36,6 @@ typedef enum _CoglBlendStringContext
COGL_BLEND_STRING_CONTEXT_TEXTURE_COMBINE
} CoglBlendStringContext;
#define COGL_BLEND_STRING_ERROR _cogl_blend_string_error_quark ()
typedef enum _CoglBlendStringError
{
COGL_BLEND_STRING_ERROR_PARSE_ERROR,
COGL_BLEND_STRING_ERROR_ARGUMENT_PARSE_ERROR,
COGL_BLEND_STRING_ERROR_INVALID_ERROR,
COGL_BLEND_STRING_ERROR_GPU_UNSUPPORTED_ERROR
} CoglBlendStringError;
/* NB: debug stringify code will get upset if these
* are re-ordered */
typedef enum _CoglBlendStringChannelMask
@ -144,8 +134,5 @@ _cogl_blend_string_split_rgba_statement (CoglBlendStringStatement *statement,
CoglBlendStringStatement *rgb,
CoglBlendStringStatement *a);
GQuark
_cogl_blend_string_error_quark (void);
#endif /* COGL_BLEND_STRING_H */