Don't make the gl flags API

We need to export the symbols so they can be used in the
inspector, but we don't really want to make this supported
public API, so keep them out of installed headers.
This commit is contained in:
Matthias Clasen 2014-11-07 07:10:49 -05:00
parent 41e9eaf64f
commit 7e405c286f
2 changed files with 14 additions and 28 deletions

View File

@ -56,34 +56,6 @@ GdkGLContext * gdk_gl_context_get_current (void);
GDK_AVAILABLE_IN_3_16
void gdk_gl_context_clear_current (void);
/**
* GdkGLFlags:
* @GDK_GL_DISABLE: Disable creating new windows with GL rendering
* @GDK_GL_ALWAYS: Make all newly created windows use GL rendering
* @GDK_GL_SOFTWARE_DRAW_GL: Always use software fallback for drawing
* GL content to a cairo_t. This disables the fast paths that exist for
* drawing directly to a window and instead reads back the pixels into
* a cairo image surface.
* @GDK_GL_SOFTWARE_DRAW_SURFACE: Always use software fallback for
* drawing cairo surfaces onto a GL-using window. This disables e.g.
* texture-from-pixmap on X11.
* @GDK_GL_TEXTURE_RECTANGLE: Use the GL_ARB_texture_rectangle extension
*
* Flags that influence the OpenGL rendering used by GDK.
*/
typedef enum {
GDK_GL_DISABLE = 1 << 0,
GDK_GL_ALWAYS = 1 << 1,
GDK_GL_SOFTWARE_DRAW_GL = 1 << 2,
GDK_GL_SOFTWARE_DRAW_SURFACE = 1 << 3,
GDK_GL_TEXTURE_RECTANGLE = 1 << 4
} GdkGLFlags;
GDK_AVAILABLE_IN_3_16
GdkGLFlags gdk_gl_get_flags (void);
GDK_AVAILABLE_IN_3_16
void gdk_gl_set_flags (GdkGLFlags flags);
G_END_DECLS
#endif /* __GDK_GL_CONTEXT_H__ */

View File

@ -94,6 +94,14 @@ typedef enum {
GDK_RENDERING_MODE_RECORDING
} GdkRenderingMode;
typedef enum {
GDK_GL_DISABLE = 1 << 0,
GDK_GL_ALWAYS = 1 << 1,
GDK_GL_SOFTWARE_DRAW_GL = 1 << 2,
GDK_GL_SOFTWARE_DRAW_SURFACE = 1 << 3,
GDK_GL_TEXTURE_RECTANGLE = 1 << 4
} GdkGLFlags;
extern GList *_gdk_default_filters;
extern GdkWindow *_gdk_parent_root;
@ -101,6 +109,12 @@ extern guint _gdk_debug_flags;
extern guint _gdk_gl_flags;
extern GdkRenderingMode _gdk_rendering_mode;
/* export these so we can use them from the inspector */
_GDK_EXTERN
GdkGLFlags gdk_gl_get_flags (void);
_GDK_EXTERN
void gdk_gl_set_flags (GdkGLFlags flags);
#ifdef G_ENABLE_DEBUG
#define GDK_NOTE(type,action) G_STMT_START { \