From e78c5ffb1b14f8a41ddce9f02132b16d7a0cbfa1 Mon Sep 17 00:00:00 2001
From: Seungha Yang <seungha.yang@navercorp.com>
Date: Tue, 18 Feb 2020 19:33:18 +0900
Subject: [PATCH] gl: Decouple win32 window and wgl context

With ANGLE, win32 window can be used with gles and egl
---
 gst-libs/gst/gl/gstglcontext.c                    | 2 +-
 gst-libs/gst/gl/meson.build                       | 2 +-
 gst-libs/gst/gl/{win32 => wgl}/gstglcontext_wgl.c | 0
 gst-libs/gst/gl/{win32 => wgl}/gstglcontext_wgl.h | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename gst-libs/gst/gl/{win32 => wgl}/gstglcontext_wgl.c (100%)
 rename gst-libs/gst/gl/{win32 => wgl}/gstglcontext_wgl.h (98%)

diff --git a/gst-libs/gst/gl/gstglcontext.c b/gst-libs/gst/gl/gstglcontext.c
index 77d047c57e..b76f246c02 100644
--- a/gst-libs/gst/gl/gstglcontext.c
+++ b/gst-libs/gst/gl/gstglcontext.c
@@ -66,7 +66,7 @@
 #include "cocoa/gstglcontext_cocoa.h"
 #endif
 #if GST_GL_HAVE_PLATFORM_WGL
-#include "win32/gstglcontext_wgl.h"
+#include "wgl/gstglcontext_wgl.h"
 #endif
 #if GST_GL_HAVE_PLATFORM_EAGL
 #include "eagl/gstglcontext_eagl.h"
diff --git a/gst-libs/gst/gl/meson.build b/gst-libs/gst/gl/meson.build
index 4f692da0ea..dc90908732 100644
--- a/gst-libs/gst/gl/meson.build
+++ b/gst-libs/gst/gl/meson.build
@@ -671,7 +671,7 @@ if need_platform_wgl != 'no' and need_win_win32 != 'no'
     gl_sources += [
       'win32/gstglwindow_win32.c',
       'win32/gstglwindow_win32.c',
-      'win32/gstglcontext_wgl.c',
+      'wgl/gstglcontext_wgl.c',
     ]
     enabled_gl_winsys += 'win32'
     gl_winsys_deps += gdi_dep
diff --git a/gst-libs/gst/gl/win32/gstglcontext_wgl.c b/gst-libs/gst/gl/wgl/gstglcontext_wgl.c
similarity index 100%
rename from gst-libs/gst/gl/win32/gstglcontext_wgl.c
rename to gst-libs/gst/gl/wgl/gstglcontext_wgl.c
diff --git a/gst-libs/gst/gl/win32/gstglcontext_wgl.h b/gst-libs/gst/gl/wgl/gstglcontext_wgl.h
similarity index 98%
rename from gst-libs/gst/gl/win32/gstglcontext_wgl.h
rename to gst-libs/gst/gl/wgl/gstglcontext_wgl.h
index f44db50d34..cff26f7a64 100644
--- a/gst-libs/gst/gl/win32/gstglcontext_wgl.h
+++ b/gst-libs/gst/gl/wgl/gstglcontext_wgl.h
@@ -21,7 +21,7 @@
 #ifndef __GST_GL_CONTEXT_WGL_H__
 #define __GST_GL_CONTEXT_WGL_H__
 
-#include "gstglwindow_win32.h"
+#include "../win32/gstglwindow_win32.h"
 
 G_BEGIN_DECLS