Merge branch 'duplicate-gl-version' into 'main'

glcontext: Remove duplicate check for GL version

See merge request GNOME/gtk!7221
This commit is contained in:
Benjamin Otte 2024-05-03 13:42:03 +00:00
commit 73ba97acd9

View File

@ -1956,8 +1956,6 @@ gdk_gl_context_get_glsl_version_string (GdkGLContext *self)
return "#version 310 es"; return "#version 310 es";
else if (gdk_gl_version_greater_equal (&priv->gl_version, &GDK_GL_VERSION_INIT (3, 0))) else if (gdk_gl_version_greater_equal (&priv->gl_version, &GDK_GL_VERSION_INIT (3, 0)))
return "#version 300 es"; return "#version 300 es";
else if (gdk_gl_version_greater_equal (&priv->gl_version, &GDK_GL_VERSION_INIT (3, 0)))
return "#version 300 es";
else else
return "#version 100"; return "#version 100";
} }