GNOME.org
 

[cogl/rstrode/wip/prepare-for-mutter-merge: 5/12] win32: drop support

commit 32caa66364cd5eeb4cdff6976efae9e361eace76
Author: Ray Strode <rstrode redhat com>
Date:   Tue Jan 12 16:44:14 2016 -0500

    win32: drop support

 build/mingw/Makefile.am                            |    1 -
 build/mingw/README                                 |    5 -
 build/mingw/mingw-fetch-dependencies.sh            |  418 --------
 build/win32/Makefile.am                            |    3 -
 build/win32/vs10/Makefile.am                       |   34 -
 build/win32/vs10/README.txt                        |   89 --
 build/win32/vs10/cogl-build-defines.props          |   61 --
 build/win32/vs10/cogl-crate.vcxproj                |  176 ----
 build/win32/vs10/cogl-crate.vcxproj.filters        |   14 -
 build/win32/vs10/cogl-gen-srcs.props               |  107 ---
 build/win32/vs10/cogl-hello.vcxproj                |  160 ----
 build/win32/vs10/cogl-hello.vcxproj.filters        |   14 -
 build/win32/vs10/cogl-info.vcxproj                 |  168 ----
 build/win32/vs10/cogl-info.vcxproj.filters         |   14 -
 build/win32/vs10/cogl-install.props                |  168 ----
 build/win32/vs10/cogl-install.vcxproj              |  217 -----
 build/win32/vs10/cogl-msaa.vcxproj                 |  169 ----
 build/win32/vs10/cogl-msaa.vcxproj.filters         |   14 -
 build/win32/vs10/cogl-pango.vcxproj.filtersin      |   19 -
 build/win32/vs10/cogl-pango.vcxprojin              |  210 -----
 build/win32/vs10/cogl-path.vcxproj.filtersin       |   25 -
 build/win32/vs10/cogl-path.vcxprojin               |  234 -----
 build/win32/vs10/cogl-version-paths.props          |   53 -
 build/win32/vs10/cogl.sln                          |  174 ----
 build/win32/vs10/cogl.vcxproj.filtersin            |   41 -
 build/win32/vs10/cogl.vcxprojin                    |  545 -----------
 .../vs10/test-conformance-cogl.vcxproj.filtersin   |   13 -
 build/win32/vs10/test-conformance-cogl.vcxprojin   |  185 ----
 build/win32/vs9/Makefile.am                        |   21 -
 build/win32/vs9/README.txt                         |   95 --
 build/win32/vs9/cogl-build-defines.vsprops         |   54 --
 build/win32/vs9/cogl-crate.vcproj                  |  161 ----
 build/win32/vs9/cogl-gen-srcs.vsprops              |  102 --
 build/win32/vs9/cogl-hello.vcproj                  |  157 ---
 build/win32/vs9/cogl-info.vcproj                   |  157 ---
 build/win32/vs9/cogl-install.vcproj                |  143 ---
 build/win32/vs9/cogl-install.vsprops               |  148 ---
 build/win32/vs9/cogl-msaa.vcproj                   |  157 ---
 build/win32/vs9/cogl-pango.vcprojin                |  208 ----
 build/win32/vs9/cogl-path.vcprojin                 |  267 ------
 build/win32/vs9/cogl-version-paths.vsprops         |   53 -
 build/win32/vs9/cogl.sln                           |  208 ----
 build/win32/vs9/cogl.vcprojin                      |  698 --------------
 build/win32/vs9/test-conformance-cogl.vcprojin     |  166 ----
 cogl/Makefile.am                                   |    9 -
 cogl/cogl-defines.h.win32.in                       |   77 --
 cogl/cogl-framebuffer.h                            |    4 -
 cogl/cogl-gl-header.h.win32                        |   48 -
 cogl/cogl-onscreen-private.h                       |    8 -
 cogl/cogl-onscreen.c                               |   29 -
 cogl/cogl-onscreen.h                               |   34 -
 cogl/cogl-poll.h                                   |    5 -
 cogl/cogl-renderer-private.h                       |    4 -
 cogl/cogl-renderer.c                               |   10 -
 cogl/cogl-renderer.h                               |    8 +-
 cogl/cogl-win32-renderer.c                         |   73 --
 cogl/cogl-win32-renderer.h                         |  123 ---
 cogl/cogl.h                                        |    3 -
 cogl/cogl.symbols                                  |    9 -
 cogl/winsys/cogl-winsys-private.h                  |    5 -
 cogl/winsys/cogl-winsys-wgl-feature-functions.h    |   44 -
 cogl/winsys/cogl-winsys-wgl-private.h              |   37 -
 cogl/winsys/cogl-winsys-wgl.c                      |  993 --------------------
 config-custom.h                                    |   10 -
 config.h.win32.in                                  |  638 -------------
 configure.ac                                       |   55 +--
 deps/gmodule/gmodule-win32.c                       |  202 ----
 deps/gmodule/gmoduleconf.h.win32                   |   44 -
 68 files changed, 3 insertions(+), 8595 deletions(-)
---
diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index 53407f0..82aee52 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -449,15 +449,6 @@ cogl_sources_c += \
        winsys/cogl-winsys-glx-private.h \
        winsys/cogl-winsys-glx.c
 endif
-if SUPPORT_WGL
-cogl_experimental_h += cogl-win32-renderer.h
-
-cogl_sources_c += \
-       cogl-win32-renderer.c \
-       winsys/cogl-winsys-wgl-private.h \
-       winsys/cogl-winsys-wgl.c \
-       winsys/cogl-winsys-wgl-feature-functions.h
-endif
 if SUPPORT_WAYLAND_EGL_SERVER
 cogl_experimental_h += cogl-wayland-server.h
 endif
diff --git a/cogl/cogl-framebuffer.h b/cogl/cogl-framebuffer.h
index 58d65a8..56ba4aa 100644
--- a/cogl/cogl-framebuffer.h
+++ b/cogl/cogl-framebuffer.h
@@ -34,10 +34,6 @@
 #ifndef __COGL_FRAMEBUFFER_H
 #define __COGL_FRAMEBUFFER_H
 
-#ifdef COGL_HAS_WIN32_SUPPORT
-#include <windows.h>
-#endif /* COGL_HAS_WIN32_SUPPORT */
-
 /* We forward declare the CoglFramebuffer type here to avoid some circular
  * dependency issues with the following headers.
  */
diff --git a/cogl/cogl-onscreen-private.h b/cogl/cogl-onscreen-private.h
index b2d7dcb..219f443 100644
--- a/cogl/cogl-onscreen-private.h
+++ b/cogl/cogl-onscreen-private.h
@@ -38,10 +38,6 @@
 
 #include <glib.h>
 
-#ifdef COGL_HAS_WIN32_SUPPORT
-#include <windows.h>
-#endif
-
 typedef struct _CoglOnscreenEvent
 {
   CoglList link;
@@ -69,10 +65,6 @@ struct _CoglOnscreen
   void *foreign_update_mask_data;
 #endif
 
-#ifdef COGL_HAS_WIN32_SUPPORT
-  HWND foreign_hwnd;
-#endif
-
 #ifdef COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT
   struct wl_surface *foreign_surface;
 #endif
diff --git a/cogl/cogl-onscreen.c b/cogl/cogl-onscreen.c
index e7af2a1..4b53bb2 100644
--- a/cogl/cogl-onscreen.c
+++ b/cogl/cogl-onscreen.c
@@ -466,35 +466,6 @@ cogl_x11_onscreen_get_visual_xid (CoglOnscreen *onscreen)
 }
 #endif /* COGL_HAS_X11_SUPPORT */
 
-#ifdef COGL_HAS_WIN32_SUPPORT
-
-void
-cogl_win32_onscreen_set_foreign_window (CoglOnscreen *onscreen,
-                                        HWND hwnd)
-{
-  onscreen->foreign_hwnd = hwnd;
-}
-
-HWND
-cogl_win32_onscreen_get_window (CoglOnscreen *onscreen)
-{
-  if (onscreen->foreign_hwnd)
-    return onscreen->foreign_hwnd;
-  else
-    {
-      CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (onscreen);
-      const CoglWinsysVtable *winsys =
-        _cogl_framebuffer_get_winsys (framebuffer);
-
-      /* This should only be called for win32 onscreens */
-      _COGL_RETURN_VAL_IF_FAIL (winsys->onscreen_win32_get_window != NULL, 0);
-
-      return winsys->onscreen_win32_get_window (onscreen);
-    }
-}
-
-#endif /* COGL_HAS_WIN32_SUPPORT */
-
 CoglFrameClosure *
 cogl_onscreen_add_frame_callback (CoglOnscreen *onscreen,
                                   CoglFrameCallback callback,
diff --git a/cogl/cogl-onscreen.h b/cogl/cogl-onscreen.h
index 481664e..c1a8bd0 100644
--- a/cogl/cogl-onscreen.h
+++ b/cogl/cogl-onscreen.h
@@ -166,40 +166,6 @@ uint32_t
 cogl_x11_onscreen_get_visual_xid (CoglOnscreen *onscreen);
 #endif /* COGL_HAS_X11 */
 
-#ifdef COGL_HAS_WIN32_SUPPORT
-/**
- * cogl_win32_onscreen_set_foreign_window:
- * @onscreen: A #CoglOnscreen framebuffer
- * @hwnd: A win32 window handle
- *
- * Ideally we would recommend that you let Cogl be responsible for
- * creating any window required to back an onscreen framebuffer but
- * if you really need to target a window created manually this
- * function can be called before @onscreen has been allocated to set a
- * foreign XID for your existing X window.
- *
- * Since: 1.10
- * Stability: unstable
- */
-void
-cogl_win32_onscreen_set_foreign_window (CoglOnscreen *onscreen,
-                                        HWND hwnd);
-
-/**
- * cogl_win32_onscreen_get_window:
- * @onscreen: A #CoglOnscreen framebuffer
- *
- * Queries the internally created window HWND backing the given @onscreen
- * framebuffer.  If cogl_win32_onscreen_set_foreign_window() has been used then
- * it will return the same handle set with that API.
- *
- * Since: 1.10
- * Stability: unstable
- */
-HWND
-cogl_win32_onscreen_get_window (CoglOnscreen *onscreen);
-#endif /* COGL_HAS_WIN32_SUPPORT */
-
 #if defined (COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT)
 struct wl_surface *
 cogl_wayland_onscreen_get_surface (CoglOnscreen *onscreen);
diff --git a/cogl/cogl-poll.h b/cogl/cogl-poll.h
index fa93d92..849e95c 100644
--- a/cogl/cogl-poll.h
+++ b/cogl/cogl-poll.h
@@ -141,11 +141,6 @@ typedef struct {
  * passing a pointer the array of CoglPollFD<!-- -->s with updated
  * revent values.
  *
- * When using the %COGL_WINSYS_ID_WGL winsys (where file descriptors
- * don't make any sense) or %COGL_WINSYS_ID_SDL (where the event
- * handling functions of SDL don't allow blocking on a file
- * descriptor) *n_poll_fds is guaranteed to be zero.
- *
  * @timeout will contain a maximum amount of time to wait in
  * microseconds before the application should wake up or -1 if the
  * application should wait indefinitely. This can also be 0 if
diff --git a/cogl/cogl-renderer-private.h b/cogl/cogl-renderer-private.h
index 7ca7030..c10c3fb 100644
--- a/cogl/cogl-renderer-private.h
+++ b/cogl/cogl-renderer-private.h
@@ -76,10 +76,6 @@ struct _CoglRenderer
   CoglBool xlib_enable_event_retrieval;
 #endif
 
-#ifdef COGL_HAS_WIN32_SUPPORT
-  CoglBool win32_enable_event_retrieval;
-#endif
-
   CoglDriver driver;
   unsigned long private_features
     [COGL_FLAGS_N_LONGS_FOR_SIZE (COGL_N_PRIVATE_FEATURES)];
diff --git a/cogl/cogl-renderer.c b/cogl/cogl-renderer.c
index 30038df..3e82a87 100644
--- a/cogl/cogl-renderer.c
+++ b/cogl/cogl-renderer.c
@@ -69,9 +69,6 @@
 #ifdef COGL_HAS_GLX_SUPPORT
 #include "cogl-winsys-glx-private.h"
 #endif
-#ifdef COGL_HAS_WGL_SUPPORT
-#include "cogl-winsys-wgl-private.h"
-#endif
 
 #ifdef COGL_HAS_XLIB_SUPPORT
 #include "cogl-xlib-renderer.h"
@@ -207,9 +204,6 @@ static CoglWinsysVtableGetter _cogl_winsys_vtable_getters[] =
 #ifdef COGL_HAS_EGL_PLATFORM_MIR_SUPPORT
   _cogl_winsys_egl_mir_get_vtable,
 #endif
-#ifdef COGL_HAS_WGL_SUPPORT
-  _cogl_winsys_wgl_get_vtable,
-#endif
   _cogl_winsys_stub_get_vtable,
 };
 
@@ -285,10 +279,6 @@ cogl_renderer_new (void)
   renderer->xlib_enable_event_retrieval = TRUE;
 #endif
 
-#ifdef COGL_HAS_WIN32_SUPPORT
-  renderer->win32_enable_event_retrieval = TRUE;
-#endif
-
 #ifdef COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT
   renderer->wayland_enable_event_dispatch = TRUE;
 #endif
diff --git a/cogl/cogl-renderer.h b/cogl/cogl-renderer.h
index 73182c1..e5aaaf9 100644
--- a/cogl/cogl-renderer.h
+++ b/cogl/cogl-renderer.h
@@ -50,8 +50,7 @@ COGL_BEGIN_DECLS
  *
  * A #CoglRenderer represents a means to render. It encapsulates the
  * selection of an underlying driver, such as OpenGL or OpenGL-ES and
- * a selection of a window system binding API such as GLX, or EGL or
- * WGL.
+ * a selection of a window system binding API such as GLX or EGL.
  *
  * A #CoglRenderer has two states, "unconnected" and "connected". When
  * a renderer is first instantiated using cogl_renderer_new() it is
@@ -117,8 +116,7 @@ cogl_is_renderer (void *object);
  * Instantiates a new (unconnected) #CoglRenderer object. A
  * #CoglRenderer represents a means to render. It encapsulates the
  * selection of an underlying driver, such as OpenGL or OpenGL-ES and
- * a selection of a window system binding API such as GLX, or EGL or
- * WGL.
+ * a selection of a window system binding API such as GLX or EGL.
  *
  * While the renderer is unconnected it can be configured so that
  * applications may specify backend constraints, such as "must use
@@ -168,7 +166,6 @@ cogl_renderer_new (void);
  * @COGL_WINSYS_ID_EGL_KMS: Use EGL with the KMS platform
  * @COGL_WINSYS_ID_EGL_ANDROID: Use EGL with the Android platform
  * @COGL_WINSYS_ID_EGL_MIR: Use EGL with the Mir server
- * @COGL_WINSYS_ID_WGL: Use the Microsoft Windows WGL binding API
  *
  * Identifies specific window system backends that Cogl supports.
  *
@@ -186,7 +183,6 @@ typedef enum
   COGL_WINSYS_ID_EGL_KMS,
   COGL_WINSYS_ID_EGL_ANDROID,
   COGL_WINSYS_ID_EGL_MIR,
-  COGL_WINSYS_ID_WGL,
 } CoglWinsysID;
 
 /**
diff --git a/cogl/cogl.h b/cogl/cogl.h
index 40da05e..baec66d 100644
--- a/cogl/cogl.h
+++ b/cogl/cogl.h
@@ -141,9 +141,6 @@
 #if defined (COGL_HAS_EGL_PLATFORM_MIR_SUPPORT)
 #include <cogl/cogl-mir-renderer.h>
 #endif
-#ifdef COGL_HAS_WIN32_SUPPORT
-#include <cogl/cogl-win32-renderer.h>
-#endif
 #ifdef COGL_HAS_GLIB_SUPPORT
 #include <cogl/cogl-glib-source.h>
 #endif
diff --git a/cogl/cogl.symbols b/cogl/cogl.symbols
index 5ae0118..1926dee 100644
--- a/cogl/cogl.symbols
+++ b/cogl/cogl.symbols
@@ -1044,15 +1044,6 @@ cogl_wayland_texture_2d_new_from_buffer
 
 cogl_winding_get_type
 
-#ifdef COGL_HAS_WIN32_SUPPORT
-cogl_win32_onscreen_get_window
-cogl_win32_onscreen_set_foreign_window
-cogl_win32_renderer_add_filter
-cogl_win32_renderer_handle_event
-cogl_win32_renderer_remove_filter
-cogl_win32_renderer_set_event_retrieval_enabled
-#endif
-
 #ifdef COGL_HAS_XLIB
 cogl_xlib_get_display
 cogl_xlib_handle_event
diff --git a/cogl/winsys/cogl-winsys-private.h b/cogl/winsys/cogl-winsys-private.h
index 2e2097f..85a67c7 100644
--- a/cogl/winsys/cogl-winsys-private.h
+++ b/cogl/winsys/cogl-winsys-private.h
@@ -148,11 +148,6 @@ typedef struct _CoglWinsysVtable
   uint32_t
   (*onscreen_x11_get_window_xid) (CoglOnscreen *onscreen);
 
-#ifdef COGL_HAS_WIN32_SUPPORT
-  HWND
-  (*onscreen_win32_get_window) (CoglOnscreen *onscreen);
-#endif
-
 #ifdef COGL_HAS_XLIB_SUPPORT
   CoglBool
   (*texture_pixmap_x11_create) (CoglTexturePixmapX11 *tex_pixmap);
diff --git a/config-custom.h b/config-custom.h
index 137b51f..08fb9a4 100644
--- a/config-custom.h
+++ b/config-custom.h
@@ -30,13 +30,3 @@
    intended for extra configuration that needs to be included by all
    Cogl source files. */
 
-/* The windows headers #define 'near' and 'far' to be blank. We
-   commonly want to use these variable names for doing perspective
-   transformation so rather than having to workaround this mis-feature
-   in Windows in the code we just #undef them here. We need to do this
-   after including windows.h */
-#ifdef _WIN32
-#include <windows.h>
-#undef near
-#undef far
-#endif /* _WIN32 */
diff --git a/configure.ac b/configure.ac
index 35d9dd9..d7d92d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -193,18 +193,6 @@ dnl ================================================================
 dnl See what platform we are building for
 dnl ================================================================
 AC_CANONICAL_HOST
-AC_MSG_CHECKING([if building for some Win32 platform])
-AS_CASE([$host],
-        [*-*-mingw*|*-*-cygwin*],
-        [
-          COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -no-undefined"
-          platform_win32=yes
-        ],
-
-        [platform_win32=no]
-)
-AC_MSG_RESULT([$platform_win32])
-AM_CONDITIONAL(OS_WIN32, [test "$platform_win32" = "yes"])
 
 AC_CHECK_HEADER([OpenGL/gl.h], [platform_quartz=yes], [platform_quartz=no])
 AM_CONDITIONAL(OS_QUARTZ, [test "$platform_quartz" = "yes"])
@@ -592,7 +580,7 @@ EGL_CHECKED=no
 
 dnl This gets set to yes if Cogl directly links to the GL library API
 dnl so it doesn't need to be dlopened. This currently happens on OSX
-dnl and WGL where it's not clear if window system API can be separated
+dnl where it's not clear if window system API can be separated
 dnl from the GL API.
 GL_LIBRARY_DIRECTLY_LINKED=no
 
@@ -607,9 +595,6 @@ AC_ARG_ENABLE(
 )
 AS_IF([test "x$enable_gles1" = "xyes"],
       [
-        AS_IF([test "x$platform_win32" = "xyes"],
-             [AC_MSG_ERROR([GLES 1 not available for win32])])
-
         enabled_drivers="$enabled_drivers gles1"
 
         cogl_gl_headers="GLES/gl.h GLES/glext.h"
@@ -687,9 +672,6 @@ AC_ARG_ENABLE(
 )
 AS_IF([test "x$enable_gles2" = "xyes"],
       [
-        AS_IF([test "x$platform_win32" = "xyes"],
-             [AC_MSG_ERROR([GLES 2 not available for win32])])
-
         enabled_drivers="$enabled_drivers gles2"
 
         cogl_gl_headers="GLES2/gl2.h GLES2/gl2ext.h"
@@ -752,17 +734,6 @@ AS_IF([test "x$enable_gl" = "xyes"],
                 COGL_GL_LIBNAME=""
               ],
 
-              [test "x$platform_win32" = "xyes"],
-             [
-               COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lopengl32 -lgdi32 -lwinmm"
-               COGL_EXTRA_CFLAGS="$COGL_EXTRA_CFLAGS -D_WIN32_WINNT=0x0500"
-                ALLOW_WGL=yes
-                dnl The GL API is being directly linked in so there is
-                dnl no need to dlopen it separately
-                GL_LIBRARY_DIRECTLY_LINKED=yes
-                COGL_GL_LIBNAME=""
-             ],
-
              [
                PKG_CHECK_EXISTS([gl],
                   dnl We don't want to use COGL_PKG_REQUIRES here because we don't want to
@@ -866,25 +837,6 @@ AS_IF([test "x$enable_glx" = "xyes"],
       ])
 AM_CONDITIONAL(SUPPORT_GLX, [test "x$SUPPORT_GLX" = "xyes"])
 
-AC_ARG_ENABLE(
-  [wgl],
-  [AC_HELP_STRING([--enable-wgl=@<:@no/yes@:>@], [Enable support for WGL @<:@default=auto@:>@])],
-  [],
-  [AS_IF([test "x$ALLOW_WGL" = "xyes"], [enable_wgl=yes], [enable_wgl=no])]
-)
-AS_IF([test "x$enable_wgl" = "xyes"],
-      [
-        AS_IF([test "x$ALLOW_WGL" != "xyes"],
-              [AC_MSG_ERROR([WGL not supported with this configuration])])
-
-        SUPPORT_WGL=yes
-        GL_WINSYS_APIS="$GL_WINSYS_APIS wgl"
-
-        AC_DEFINE([COGL_HAS_WGL_SUPPORT], [1], [Cogl supports OpenGL using the WGL API])
-        COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_WIN32_SUPPORT"
-      ])
-AM_CONDITIONAL(SUPPORT_WGL, [test "x$SUPPORT_WGL" = "xyes"])
-
 EGL_PLATFORM_COUNT=0
 
 AC_ARG_ENABLE(
@@ -1302,11 +1254,7 @@ AC_SUBST(MAINTAINER_CFLAGS)
 AC_OUTPUT(
 Makefile
 README
-config.h.win32
 build/Makefile
-build/win32/Makefile
-build/win32/vs9/Makefile
-build/win32/vs10/Makefile
 deps/Makefile
 deps/glib/Makefile
 deps/gmodule/Makefile
@@ -1316,7 +1264,6 @@ cogl/Makefile
 cogl/cogl-1.0.pc
 cogl/cogl-2.0-experimental.pc
 cogl/cogl-defines.h
-cogl/cogl-defines.h.win32
 cogl/cogl-gl-header.h
 cogl/cogl-egl-defines.h
 cogl/cogl.rc
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]