callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gdk/gl: Allow autodetection for GL/GLES

Browse Source 
If the GdkGLContext was not explicitly instructed to use or not GLES, we
can detect whether the underlying API is going to be desktop GL or GLES.

https://bugzilla.gnome.org/show_bug.cgi?id=773180
This commit is contained in:
Emmanuele Bassi 2016-10-19 13:43:17 +01:00 committed by Matthias Clasen
parent d40c6f180f
commit 803362bb5d
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gdk/gdkglcontext.c
View File

@ -105,7 +105,8 @@ typedef struct {
guint debug_enabled : 1; guint debug_enabled : 1;
guint forward_compatible : 1; guint forward_compatible : 1;
guint is_legacy : 1; guint is_legacy : 1;
guint use_es : 1;
int use_es;
GdkGLContextPaintData *paint_data; GdkGLContextPaintData *paint_data;
} GdkGLContextPrivate; } GdkGLContextPrivate;
@ -362,6 +363,9 @@ gdk_gl_context_class_init (GdkGLContextClass *klass)
static void static void
gdk_gl_context_init (GdkGLContext *self) gdk_gl_context_init (GdkGLContext *self)
{ {
GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (self);
priv->use_es = -1;
} }
/*< private > /*< private >
@ -683,13 +687,18 @@ gdk_gl_context_set_is_legacy (GdkGLContext *context,
/** /**
* gdk_gl_context_set_use_es: * gdk_gl_context_set_use_es:
* @context: a #GdkGLContext: * @context: a #GdkGLContext:
* @use_es: whether the context should use OpenGL ES instead of OpenGL * @use_es: whether the context should use OpenGL ES instead of OpenGL,
* or -1 to allow auto-detection
* *
* Requests that GDK create a OpenGL ES context instead of an OpenGL one, * Requests that GDK create a OpenGL ES context instead of an OpenGL one,
* if the platform and windowing system allows it. * if the platform and windowing system allows it.
* *
* The @context must not have been realized. * The @context must not have been realized.
* *
* By default, GDK will attempt to automatically detect whether the
* underlying GL implementation is OpenGL or OpenGL ES once the @context
* is realized.
*
* You should check the return value of gdk_gl_context_get_use_es() after * You should check the return value of gdk_gl_context_get_use_es() after
* calling gdk_gl_context_realize() to decide whether to use the OpenGL or * calling gdk_gl_context_realize() to decide whether to use the OpenGL or
* OpenGL ES API, extensions, or shaders. * OpenGL ES API, extensions, or shaders.
@ -698,14 +707,15 @@ gdk_gl_context_set_is_legacy (GdkGLContext *context,
*/ */
void void
gdk_gl_context_set_use_es (GdkGLContext *context, gdk_gl_context_set_use_es (GdkGLContext *context,
gboolean use_es) int use_es)
{ {
GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context); GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context);
g_return_if_fail (GDK_IS_GL_CONTEXT (context)); g_return_if_fail (GDK_IS_GL_CONTEXT (context));
g_return_if_fail (!priv->realized); g_return_if_fail (!priv->realized);
priv->use_es = !!use_es; if (priv->use_es != use_es)
priv->use_es = use_es;
} }
/** /**
@ -725,7 +735,10 @@ gdk_gl_context_get_use_es (GdkGLContext *context)
g_return_val_if_fail (GDK_IS_GL_CONTEXT (context), FALSE); g_return_val_if_fail (GDK_IS_GL_CONTEXT (context), FALSE);
return priv->use_es; if (!priv->realized)
return FALSE;
return priv->use_es > 0;
} }
/** /**
@ -771,6 +784,9 @@ gdk_gl_context_check_extensions (GdkGLContext *context)
priv->gl_version = epoxy_gl_version (); priv->gl_version = epoxy_gl_version ();
if (priv->use_es < 0)
priv->use_es = !epoxy_is_desktop_gl ();
if (priv->use_es) if (priv->use_es)
{ {
has_npot = priv->gl_version >= 20; has_npot = priv->gl_version >= 20;

2
gdk/gdkglcontext.h
View File

@ -75,7 +75,7 @@ GDK_AVAILABLE_IN_3_16
gboolean gdk_gl_context_get_forward_compatible (GdkGLContext *context); gboolean gdk_gl_context_get_forward_compatible (GdkGLContext *context);
GDK_AVAILABLE_IN_3_22 GDK_AVAILABLE_IN_3_22
void gdk_gl_context_set_use_es (GdkGLContext *context, void gdk_gl_context_set_use_es (GdkGLContext *context,
gboolean use_es); int use_es);
GDK_AVAILABLE_IN_3_22 GDK_AVAILABLE_IN_3_22
gboolean gdk_gl_context_get_use_es (GdkGLContext *context); gboolean gdk_gl_context_get_use_es (GdkGLContext *context);