AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

glcontext: Simplify get_required_version api

Browse Source 
Simplify the API to just return the requirements that the user
has asked for. The rest of the code was undocumented and previously
used as a buggy source for a default value from internal code.
Since the buggy code is now fixed, remove all unnecessary cruft.
This commit is contained in:
Pablo Correa Gómez 2022-05-30 20:18:15 +02:00
parent 9426b20759
commit c4feca1311
No known key found for this signature in database
GPG Key ID: 7A342565FF635F79
1 changed files with 9 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
gdk/gdkglcontext.c
View File

@ -1065,7 +1065,10 @@ gdk_gl_context_check_version (GdkGLContext *self,
* @major: (out) (nullable): return location for the major version to request * @major: (out) (nullable): return location for the major version to request
* @minor: (out) (nullable): return location for the minor version to request * @minor: (out) (nullable): return location for the minor version to request
* *
* Retrieves required OpenGL version. * Retrieves required OpenGL version set as a requirement for the @context
* realization. It will not change even if a greater OpenGL version is supported
* and used after the @context is realized. See
* [method@Gdk.GLContext.get_version] for the real version in use.
* *
* See [method@Gdk.GLContext.set_required_version]. * See [method@Gdk.GLContext.set_required_version].
*/ */
@ -1075,47 +1078,14 @@ gdk_gl_context_get_required_version (GdkGLContext *context,
int *minor) int *minor)
{ {
GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context); GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context);
gboolean force_gles = FALSE;
GdkDisplay *display;
int default_major, default_minor;
int maj, min;
g_return_if_fail (GDK_IS_GL_CONTEXT (context)); g_return_if_fail (GDK_IS_GL_CONTEXT (context));
display = gdk_draw_context_get_display (GDK_DRAW_CONTEXT (context)); if (major != NULL)
*major = priv->major;
#ifdef G_ENABLE_DEBUG if (minor != NULL)
force_gles = GDK_DISPLAY_DEBUG_CHECK (display, GL_GLES); *minor = priv->minor;
#endif
/* libANGLE on Windows at least requires GLES 3.0+ */
if (display->have_egl_win32_libangle)
force_gles = TRUE;
/* Default fallback values for uninitialised contexts; we
* enforce a context version number of 3.2 for desktop GL,
* and 2.0 for GLES
*/
if (gdk_gl_context_get_use_es (context) || force_gles)
{
default_major = display->have_egl_win32_libangle ? 3 : 2;
default_minor = 0;
} }
else
{
default_major = 3;
default_minor = 2;
}
if (priv->major > 0)
maj = priv->major;
else
maj = default_major;
if (priv->minor > 0)
min = priv->minor;
else
min = default_minor;
void void
gdk_gl_context_get_clipped_version (GdkGLContext *context, gdk_gl_context_get_clipped_version (GdkGLContext *context,