AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-28 22:41:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip/chergert/gdk-macos-for-master' into 'master'

Browse Source 
macos: fix GL renderer for macOS

Closes #3420

See merge request GNOME/gtk!2922
This commit is contained in:
Emmanuele Bassi 2020-12-04 22:37:00 +00:00
commit 4087055b18
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gsk/gl/gskglshaderbuilder.c
View File

@ -229,6 +229,8 @@ gsk_gl_shader_builder_create_program (GskGLShaderBuilder *self,
program_id = glCreateProgram ();
glAttachShader (program_id, vertex_id);
glAttachShader (program_id, fragment_id);
glBindAttribLocation (program_id, 0, "aPosition");
glBindAttribLocation (program_id, 1, "vUv");
glLinkProgram (program_id);
glGetProgramiv (program_id, GL_LINK_STATUS, &status);

3
gsk/gskrenderer.c
View File

@ -567,9 +567,8 @@ get_renderer_for_backend (GdkSurface *surface)
return GSK_TYPE_BROADWAY_RENDERER;
#endif
#ifdef GDK_WINDOWING_MACOS
/* Use Cairo until GL renderer is working */
if (GDK_IS_MACOS_SURFACE (surface))
return GSK_TYPE_CAIRO_RENDERER;
return GSK_TYPE_GL_RENDERER;
#endif
#ifdef GDK_WINDOWING_WIN32
if (GDK_IS_WIN32_SURFACE (surface))