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

Merge branch 'gtk4-win32-egl' into 'main'

Browse Source 
Fix running GTK4 under EGL on Windows

See merge request GNOME/gtk!4188
This commit is contained in:
Benjamin Otte 2021-12-03 10:48:50 +00:00
commit 59238c6e73
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gdk/win32/gdksurface-win32.c
View File

@ -638,6 +638,7 @@ _gdk_win32_display_create_surface (GdkDisplay *display,
return NULL; return NULL;
} }
gdk_surface_set_egl_native_window (surface, (void *) impl->handle);
if (display_win32->tablet_input_api == GDK_WIN32_TABLET_INPUT_API_WINPOINTER) if (display_win32->tablet_input_api == GDK_WIN32_TABLET_INPUT_API_WINPOINTER)
gdk_winpointer_initialize_surface (surface); gdk_winpointer_initialize_surface (surface);
@ -693,6 +694,7 @@ gdk_win32_surface_destroy (GdkSurface *window,
if (!foreign_destroy) if (!foreign_destroy)
{ {
gdk_surface_set_egl_native_window (window, NULL);
window->destroyed = TRUE; window->destroyed = TRUE;
DestroyWindow (GDK_SURFACE_HWND (window)); DestroyWindow (GDK_SURFACE_HWND (window));
} }

29
gsk/gl/gskglcompiler.c
View File

@ -28,10 +28,11 @@
#include "gskglcompilerprivate.h" #include "gskglcompilerprivate.h"
#include "gskglprogramprivate.h" #include "gskglprogramprivate.h"
#define SHADER_VERSION_GLES 100 #define SHADER_VERSION_GLES "100"
#define SHADER_VERSION_GL2_LEGACY 110 #define SHADER_VERSION_GLES3 "300 es"
#define SHADER_VERSION_GL3_LEGACY 130 #define SHADER_VERSION_GL2_LEGACY "110"
#define SHADER_VERSION_GL3 150 #define SHADER_VERSION_GL3_LEGACY "130"
#define SHADER_VERSION_GL3 "150"
struct _GskGLCompiler struct _GskGLCompiler
{ {
@ -49,7 +50,7 @@ struct _GskGLCompiler
GArray *attrib_locations; GArray *attrib_locations;
int glsl_version; const char *glsl_version;
guint gl3 : 1; guint gl3 : 1;
guint gles : 1; guint gles : 1;
@ -98,7 +99,7 @@ gsk_gl_compiler_class_init (GskGLCompilerClass *klass)
static void static void
gsk_gl_compiler_init (GskGLCompiler *self) gsk_gl_compiler_init (GskGLCompiler *self)
{ {
self->glsl_version = 150; self->glsl_version = "150";
self->attrib_locations = g_array_new (FALSE, FALSE, sizeof (GskGLProgramAttrib)); self->attrib_locations = g_array_new (FALSE, FALSE, sizeof (GskGLProgramAttrib));
self->all_preamble = g_bytes_ref (empty_bytes); self->all_preamble = g_bytes_ref (empty_bytes);
self->vertex_preamble = g_bytes_ref (empty_bytes); self->vertex_preamble = g_bytes_ref (empty_bytes);
@ -127,8 +128,18 @@ gsk_gl_compiler_new (GskGLDriver *driver,
if (gdk_gl_context_get_use_es (context)) if (gdk_gl_context_get_use_es (context))
{ {
self->glsl_version = SHADER_VERSION_GLES; int maj, min;
self->gles = TRUE;
/* for OpenGL/ES 3.0+, use "300 es" as our shader version */
gdk_gl_context_get_version (context, &maj, &min);
if (maj >= 3)
self->glsl_version = SHADER_VERSION_GLES3;
else
{
self->glsl_version = SHADER_VERSION_GLES;
self->gles = TRUE;
}
} }
else if (gdk_gl_context_is_legacy (context)) else if (gdk_gl_context_is_legacy (context))
{ {
@ -546,7 +557,7 @@ gsk_gl_compiler_compile (GskGLCompiler *self,
gsk_gl_command_queue_make_current (self->driver->command_queue); gsk_gl_command_queue_make_current (self->driver->command_queue);
g_snprintf (version, sizeof version, "#version %d\n", self->glsl_version); g_snprintf (version, sizeof version, "#version %s\n", self->glsl_version);
if (self->debug_shaders) if (self->debug_shaders)
debug = "#define GSK_DEBUG 1\n"; debug = "#define GSK_DEBUG 1\n";