From 112f85a474d57da3404773373ff08adc479767ae Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Wed, 28 Sep 2016 18:04:21 +1000 Subject: [PATCH] gl/win32: remove egl implementation It hasn't been used in ages and is dead code. --- gst-libs/gst/gl/win32/Makefile.am | 4 - gst-libs/gst/gl/win32/gstglwindow_win32_egl.c | 281 ------------------ gst-libs/gst/gl/win32/gstglwindow_win32_egl.h | 67 ----- 3 files changed, 352 deletions(-) delete mode 100644 gst-libs/gst/gl/win32/gstglwindow_win32_egl.c delete mode 100644 gst-libs/gst/gl/win32/gstglwindow_win32_egl.h diff --git a/gst-libs/gst/gl/win32/Makefile.am b/gst-libs/gst/gl/win32/Makefile.am index 80da958a50..40f591c08a 100644 --- a/gst-libs/gst/gl/win32/Makefile.am +++ b/gst-libs/gst/gl/win32/Makefile.am @@ -14,10 +14,6 @@ if USE_WGL libgstgl_win32_la_SOURCES += gstglcontext_wgl.c noinst_HEADERS += gstglcontext_wgl.h endif -#if USE_EGL -#libgstgl_win32_la_SOURCES += gstglwindow_win32_egl.c -#noinst_HEADERS += gstglwindow_win32_egl.h -#endif libgstgl_win32_la_CFLAGS = \ -I$(top_srcdir)/gst-libs \ diff --git a/gst-libs/gst/gl/win32/gstglwindow_win32_egl.c b/gst-libs/gst/gl/win32/gstglwindow_win32_egl.c deleted file mode 100644 index 6aa4903e4b..0000000000 --- a/gst-libs/gst/gl/win32/gstglwindow_win32_egl.c +++ /dev/null @@ -1,281 +0,0 @@ -/* - * GStreamer - * Copyright (C) 2009 Julien Isorce - * Copyright (C) 2012 Matthew Waters - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include - -#include "../gstgl_fwd.h" -#include - -#include "gstglwindow_win32_egl.h" - -static guintptr gst_gl_window_win32_wgl_get_gl_context (GstGLWindowWin32 * - window_win32); -static void gst_gl_window_win32_wgl_swap_buffers (GstGLWindowWin32 * - window_win32); -static gboolean gst_gl_window_win32_wgl_choose_format (GstGLWindowWin32 * - window_win32); -static gboolean gst_gl_window_win32_wgl_activate (GstGLWindowWin32 * - window_win32, gboolean activate); -static gboolean gst_gl_window_win32_wgl_create_context (GstGLWindowWin32 * - window_win32, GstGLAPI gl_api, guintptr external_gl_context, - GError ** error); -static void gst_gl_window_win32_wgl_destroy_context (GstGLWindowWin32 * - window_win32); -GstGLAPI gst_gl_window_win32_egl_get_gl_api (GstGLWindow * window); - -const gchar *WinEGLErrorString (); - -#define GST_CAT_DEFAULT gst_gl_window_debug - -#define gst_gl_window_win32_wgl_parent_class parent_class -G_DEFINE_TYPE (GstGLWindowWin32EGL, gst_gl_window_win32_egl, - GST_GL_TYPE_WINDOW); - -static void -gst_gl_window_win32_egl_class_init (GstGLWindowWin32EGLClass * klass) -{ - GstGLWindowClass *window_class = (GstGLWindowClass *) klass; - GstGLWindowWin32Class *window_win32_class = (GstGLWindowWin32 *) klass; - - window_win32_class->get_gl_context = - GST_DEBUG_FUNCPTR (gst_gl_window_win32_egl_get_gl_context); - window_win32_class->choose_format = - GST_DEBUG_FUNCPTR (gst_gl_window_win32_egl_choose_format); - window_win32_class->activate = - GST_DEBUG_FUNCPTR (gst_gl_window_win32_egl_activate); - window_win32_class->create_context = - GST_DEBUG_FUNCPTR (gst_gl_window_win32_egl_create_context); - window_win32_class->destroy_context = - GST_DEBUG_FUNCPTR (gst_gl_window_win32_egl_destroy_context); - window_win32_class->swap_buffers = - GST_DEBUG_FUNCPTR (gst_gl_window_win32_egl_swap_buffers); - - window_class->get_gl_api = - GST_DEBUG_FUNCPTR (gst_gl_window_win32_egl_get_gl_api); -} - -static void -gst_gl_window_win32_egl_init (GstGLWindow * window) -{ -} - -/* Must be called in the gl thread */ -GstGLWindowWin32EGL * -gst_gl_window_win32_egl_new (void) -{ - GstGLWindowWin32EGL *window = - g_object_new (GST_GL_TYPE_WINDOW_WIN32_EGL, NULL); - - return window; -} - -guintptr -gst_gl_window_win32_egl_get_gl_context (GstGLWindowWin32 * window_win32) -{ - return (guintptr) GST_GL_WINDOW_WIN32_EGL (window_win32)->wgl_context; -} - -static gboolean -gst_gl_window_win32_egl_activate (GstGLWindowWin32 * window_win32, - gboolean activate) -{ - GstGLWindowWin32EGL window; - gboolean result; - - window = GST_GL_WINDOW_WIN32_ELG (window_win32); - - if (activate) { - result = eglMakeCurrent (window->display, window->surface, window->surface, - window->gl_context); - } else { - result = eglMakeCurrent (window->display, EGL_NO_SURFACE, EGL_NO_SURFACE, - EGL_NO_CONTEXT) - } - - return result; -} - -static gboolean -gst_gl_window_win32_egl_create_context (GstGLWindowWin32 * window_win32, - GstGLAPI gl_api, guintptr external_gl_context, GError ** error) -{ - GstGLWindowWin32EGL *window_egl; - EGLint majorVersion; - EGLint minorVersion; - EGLint numConfigs; - EGLConfig config; - EGLint contextAttribs[] = - { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE, EGL_NONE }; - - EGLint attribList[] = { - EGL_RED_SIZE, 5, - EGL_GREEN_SIZE, 6, - EGL_BLUE_SIZE, 5, - EGL_ALPHA_SIZE, 8, - EGL_DEPTH_SIZE, 8, - EGL_STENCIL_SIZE, 8, - EGL_SAMPLE_BUFFERS, EGL_DONT_CARE, //1 - EGL_NONE - }; - - window_egl = GST_GL_WINDOW_WIN32_EGL (window_win32); - - window_egl->display = eglGetDisplay (window_win32->device); - if (priv->display != EGL_NO_DISPLAY) - GST_DEBUG ("display retrieved: %d", window_egl->display); - else { - g_set_error (error, GST_GL_WINDOW_ERROR, - GST_GL_WINDOW_ERROR_RESOURCE_UNAVAILABLE, - "failed to retrieve display: %s", WinEGLErrorString ()); - goto failure; - } - - if (eglInitialize (priv->display, &majorVersion, &minorVersion)) - GST_DEBUG ("egl initialized: %d.%d", majorVersion, minorVersion); - else { - g_set_error (error, GST_GL_WINDOW_ERROR, - GST_GL_WINDOW_ERROR_RESOURCE_UNAVAILABLE, - "failed to initialize egl: %s", WinEGLErrorString ()); - goto failure; - } - - if (eglGetConfigs (window_egl->display, NULL, 0, &numConfigs)) - GST_DEBUG ("configs retrieved: %d", numConfigs); - else { - g_set_error (error, GST_GL_WINDOW_ERROR, GST_GL_WINDOW_ERROR_WRONG_CONFIG, - "failed to retrieve configs %s", WinEGLErrorString ()); - goto failure; - } - - if (eglChooseConfig (priv->display, attribList, &config, 1, &numConfigs)) - GST_DEBUG ("config set: %d, %d", config, numConfigs); - else { - g_set_error (error, GST_GL_WINDOW_ERROR, GST_GL_WINDOW_ERROR_WRONG_CONFIG, - "failed to set config %s", WinEGLErrorString ()); - goto failure; - } - - window_egl->surface = - eglCreateWindowSurface (window_egl->display, config, - (EGLNativeWindowType) WindowFromDC (window_win32->device), NULL); - if (priv->surface != EGL_NO_SURFACE) - GST_DEBUG ("surface created: %d", window_egl->surface); - else { - g_set_error (error, GST_GL_WINDOW_ERROR, GST_GL_WINDOW_ERROR_CREATE_CONTEXT, - "failed to create surface %s", WinEGLErrorString ()); - goto failure; - } - - window_egl->egl_context = - eglCreateContext (window_egl->display, config, external_gl_context, - contextAttribs); - if (window_egl->egl_context != EGL_NO_CONTEXT) - GST_DEBUG ("gl context created: %lud, external: %lud", - (guintptr) window_egl->egl_context, (guintptr) external_gl_context); - else { - g_set_error (error, GST_GL_WINDOW_ERROR, GST_GL_WINDOW_ERROR_CREATE_CONTEXT, - "failed to create glcontext with external: %lud, %s", - (guintptr) external_gl_context, WinEGLErrorString ()); - goto failure; - } - - return TRUE; - -failure: - return FALSE; -} - -static void -gst_gl_window_win32_egl_destroy_context (GstGLWindowWin32 * window_win32) -{ - GstGLWindowWin32EGL *window_egl; - - window_egl = GST_GL_WINDOW_WIN32_EGL (window_win32); - - if (window_egl->egl_context) { - if (!eglDestroyContext (window_egl->display, window_egl->egl_context)) - GST_DEBUG ("failed to destroy context %d, %s\n", window_egl->egl_context, - WinEGLErrorString ()); - window_egl->egl_context = NULL; - } - - if (window_egl->surface) { - if (!eglDestroySurface (window_egl->display, window_egl->surface)) - GST_DEBUG ("failed to destroy surface %d, %s\n", window_egl->surface, - WinEGLErrorString ()); - window_egl->surface = NULL; - } - - if (window_egl->display) { - if (!eglTerminate (window_egl->display)) - GST_DEBUG ("failed to terminate display %d, %s\n", window_egl->display, - WinEGLErrorString ()); - window_egl->display = NULL; - } -} - -GstGLAPI -gst_gl_window_win32_egl_get_gl_api (GstGLWindow * window) -{ - return GST_GL_API_GLES2; -} - -const gchar * -WinEGLErrorString () -{ - EGLint nErr = eglGetError (); - switch (nErr) { - case EGL_SUCCESS: - return "EGL_SUCCESS"; - case EGL_BAD_DISPLAY: - return "EGL_BAD_DISPLAY"; - case EGL_NOT_INITIALIZED: - return "EGL_NOT_INITIALIZED"; - case EGL_BAD_ACCESS: - return "EGL_BAD_ACCESS"; - case EGL_BAD_ALLOC: - return "EGL_BAD_ALLOC"; - case EGL_BAD_ATTRIBUTE: - return "EGL_BAD_ATTRIBUTE"; - case EGL_BAD_CONFIG: - return "EGL_BAD_CONFIG"; - case EGL_BAD_CONTEXT: - return "EGL_BAD_CONTEXT"; - case EGL_BAD_CURRENT_SURFACE: - return "EGL_BAD_CURRENT_SURFACE"; - case EGL_BAD_MATCH: - return "EGL_BAD_MATCH"; - case EGL_BAD_NATIVE_PIXMAP: - return "EGL_BAD_NATIVE_PIXMAP"; - case EGL_BAD_NATIVE_WINDOW: - return "EGL_BAD_NATIVE_WINDOW"; - case EGL_BAD_PARAMETER: - return "EGL_BAD_PARAMETER"; - case EGL_BAD_SURFACE: - return "EGL_BAD_SURFACE"; - default: - return "unknown"; - } -} diff --git a/gst-libs/gst/gl/win32/gstglwindow_win32_egl.h b/gst-libs/gst/gl/win32/gstglwindow_win32_egl.h deleted file mode 100644 index 025c4c1fbb..0000000000 --- a/gst-libs/gst/gl/win32/gstglwindow_win32_egl.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - * GStreamer - * Copyright (C) 2012 Matthew Waters - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#ifndef __GST_GL_WINDOW_WIN32_EGL_H__ -#define __GST_GL_WINDOW_WIN32_EGL_H__ - -#include - -#include "gstglwindow_win32.h" - -G_BEGIN_DECLS - -#define GST_GL_TYPE_WINDOW_WIN32_EGL (gst_gl_window_win32_egl_get_type()) -#define GST_GL_WINDOW_WIN32_EGL(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GST_GL_TYPE_WINDOW_WIN32_EGL, GstGLWindowWin32EGL)) -#define GST_GL_WINDOW_WIN32_EGL_CLASS(k) (G_TYPE_CHECK_CLASS((k), GST_GL_TYPE_WINDOW_WIN32_EGL, GstGLWindowWin32EGLClass)) -#define GST_IS_GL_WINDOW_WIN32_EGL(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GST_GL_TYPE_WINDOW_WIN32_EGL)) -#define GST_IS_GL_WINDOW_WIN32_EGL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), GST_GL_TYPE_WINDOW_WIN32_EGL)) -#define GST_GL_WINDOW_WIN32_EGL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GST_GL_TYPE_WINDOW_WIN32_EGL, GstGLWindowWin32EGLClass)) - -typedef struct _GstGLWindowWin32EGL GstGLWindowWin32EGL; -typedef struct _GstGLWindowWin32EGLClass GstGLWindowWin32EGLClass; - -struct _GstGLWindowWin32EGL { - /*< private >*/ - GstGLWindowWin32 parent; - - EGLNativeWindowType internal_win_id; - EGLDisplay display; - EGLSurface surface; - EGLContext egl_context; - EGLContext external_gl_context; - - gpointer _reserved[GST_PADDING]; -}; - -struct _GstGLWindowWin32EGLClass { - /*< private >*/ - GstGLWindowWin32Class parent_class; - - /*< private >*/ - gpointer _reserved[GST_PADDING]; -}; - -GType gst_gl_window_win32_egl_get_type (void); - -GstGLWindowWin32EGL * gst_gl_window_win32_egl_new (void); - -G_END_DECLS - -#endif /* __GST_GL_WINDOW_X11_H__ */