From 97d30247013792f966d8a731ea3d4d8e17702b80 Mon Sep 17 00:00:00 2001
From: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Thu, 19 Aug 2021 18:34:13 +0800
Subject: [PATCH] gdk/win32: Some further small GL-related cleanup

Remove from gdkglcontext-win32.h items that aren't really necessary, and
just include gdkglcontext-win32.h where applicable.
---
 gdk/win32/gdkdisplay-win32.c   | 4 ----
 gdk/win32/gdkdisplay-win32.h   | 5 +----
 gdk/win32/gdkglcontext-win32.h | 4 ----
 gdk/win32/gdkwindow-win32.h    | 5 +----
 4 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index 2598c8ccd7..cad26edf4f 100644
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -31,10 +31,6 @@
 #include "gdkmonitor-win32.h"
 #include "gdkwin32.h"
 
-#ifdef GDK_WIN32_ENABLE_EGL
-# include <epoxy/egl.h>
-#endif
-
 #include "gdkwin32langnotification.h"
 
 #ifndef IMAGE_FILE_MACHINE_ARM64
diff --git a/gdk/win32/gdkdisplay-win32.h b/gdk/win32/gdkdisplay-win32.h
index 7a7e898ff8..602e666bb2 100644
--- a/gdk/win32/gdkdisplay-win32.h
+++ b/gdk/win32/gdkdisplay-win32.h
@@ -18,10 +18,7 @@
  */
 
 #include "gdkdisplayprivate.h"
-
-#ifdef GDK_WIN32_ENABLE_EGL
-# include <epoxy/egl.h>
-#endif
+#include "gdkglcontext-win32.h"
 
 #ifndef __GDK_DISPLAY__WIN32_H__
 #define __GDK_DISPLAY__WIN32_H__
diff --git a/gdk/win32/gdkglcontext-win32.h b/gdk/win32/gdkglcontext-win32.h
index 283e67c969..a4b8b2dda2 100644
--- a/gdk/win32/gdkglcontext-win32.h
+++ b/gdk/win32/gdkglcontext-win32.h
@@ -35,10 +35,6 @@
 
 G_BEGIN_DECLS
 
-#define GDK_WIN32_GL_CONTEXT_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_WIN32_GL_CONTEXT, GdkWin32GLContextClass))
-#define GDK_WIN32_GL_CONTEXT_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_WIN32_GL_CONTEXT, GdkWin32GLContextClass))
-#define GDK_WIN32_IS_GL_CONTEXT_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_WIN32_GL_CONTEXT)
-
 void
 gdk_win32_window_invalidate_egl_framebuffer (GdkWindow      *window);
 
diff --git a/gdk/win32/gdkwindow-win32.h b/gdk/win32/gdkwindow-win32.h
index 23f5b8d86c..387e1b702f 100644
--- a/gdk/win32/gdkwindow-win32.h
+++ b/gdk/win32/gdkwindow-win32.h
@@ -26,15 +26,12 @@
 #define __GDK_WINDOW_WIN32_H__
 
 #include "gdk/win32/gdkprivate-win32.h"
+#include "gdk/win32/gdkglcontext-win32.h"
 #include "gdk/gdkwindowimpl.h"
 #include "gdk/gdkcursor.h"
 
 #include <windows.h>
 
-#ifdef GDK_WIN32_ENABLE_EGL
-#include <epoxy/egl.h>
-#endif
-
 G_BEGIN_DECLS
 
 /* Window implementation for Win32