mirror of
https://github.com/brl/mutter.git
synced 2024-11-29 11:30:45 -05:00
cogl: remove OSX/WIN32 specific bits in favour of a stub winsys
Until Cogl gains native win32/OSX support this remove the osx and win32 winsys files and instead we'll just rely on the stub-winsys.c to handle these platforms. Since the only thing the platform specific files were providing anyway was a get_proc_address function; it was trivial to simply update the clutter backend code to handle this directly for now.
This commit is contained in:
parent
a8c7f43a7c
commit
b3a7ee5930
@ -342,14 +342,8 @@ if SUPPORT_EGL_PLATFORM_GDL
|
|||||||
cogl_sources_c += \
|
cogl_sources_c += \
|
||||||
$(srcdir)/winsys/cogl-winsys-egl.c
|
$(srcdir)/winsys/cogl-winsys-egl.c
|
||||||
endif
|
endif
|
||||||
if SUPPORT_WIN32
|
if SUPPORT_STUB
|
||||||
cogl_sources_c += \
|
cogl_sources_c += \
|
||||||
$(srcdir)/winsys/cogl-winsys-win32.c \
|
|
||||||
$(srcdir)/winsys/cogl-winsys-stub.c
|
|
||||||
endif
|
|
||||||
if SUPPORT_OSX
|
|
||||||
cogl_sources_c += \
|
|
||||||
$(srcdir)/winsys/cogl-winsys-osx.c \
|
|
||||||
$(srcdir)/winsys/cogl-winsys-stub.c
|
$(srcdir)/winsys/cogl-winsys-stub.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -1,35 +0,0 @@
|
|||||||
/*
|
|
||||||
* Cogl
|
|
||||||
*
|
|
||||||
* An object oriented GL/GLES Abstraction/Utility Layer
|
|
||||||
*
|
|
||||||
* Copyright (C) 2007,2008,2009 Intel Corporation.
|
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser 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
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
|
||||||
#include "config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "cogl.h"
|
|
||||||
|
|
||||||
CoglFuncPtr
|
|
||||||
_cogl_winsys_get_proc_address (const char *name)
|
|
||||||
{
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
@ -32,6 +32,11 @@
|
|||||||
* calls into the winsys layer with #ifdef COGL_HAS_FULL_WINSYS
|
* calls into the winsys layer with #ifdef COGL_HAS_FULL_WINSYS
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
CoglFuncPtr
|
||||||
|
_cogl_winsys_get_proc_address (const char *name)
|
||||||
|
{
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
_cogl_winsys_onscreen_swap_buffers (CoglOnscreen *onscreen)
|
_cogl_winsys_onscreen_swap_buffers (CoglOnscreen *onscreen)
|
||||||
|
@ -1,35 +0,0 @@
|
|||||||
/*
|
|
||||||
* Cogl
|
|
||||||
*
|
|
||||||
* An object oriented GL/GLES Abstraction/Utility Layer
|
|
||||||
*
|
|
||||||
* Copyright (C) 2007,2008,2009 Intel Corporation.
|
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser 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
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
|
||||||
#include "config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "cogl.h"
|
|
||||||
|
|
||||||
CoglFuncPtr
|
|
||||||
_cogl_winsys_get_proc_address (const char *name)
|
|
||||||
{
|
|
||||||
return (CoglFuncPtr) wglGetProcAddress ((LPCSTR) name);
|
|
||||||
}
|
|
||||||
|
|
@ -399,6 +399,7 @@ AS_IF([test "x$enable_stub_winsys" = "xyes"],
|
|||||||
GL_WINSYS_APIS="$GL_WINSYS_APIS stub"
|
GL_WINSYS_APIS="$GL_WINSYS_APIS stub"
|
||||||
ALLOW_GLX=no
|
ALLOW_GLX=no
|
||||||
])
|
])
|
||||||
|
AM_CONDITIONAL(SUPPORT_STUB, [test "x$enable_stub_winsys" = "xyes"])
|
||||||
|
|
||||||
AC_ARG_ENABLE(
|
AC_ARG_ENABLE(
|
||||||
[glx],
|
[glx],
|
||||||
@ -564,11 +565,6 @@ AM_CONDITIONAL(SUPPORT_XLIB, [test "x$SUPPORT_XLIB" = "xyes"])
|
|||||||
|
|
||||||
AM_CONDITIONAL(COGL_STANDALONE_BUILD, [true])
|
AM_CONDITIONAL(COGL_STANDALONE_BUILD, [true])
|
||||||
|
|
||||||
AM_CONDITIONAL(SUPPORT_OSX, [false])
|
|
||||||
AM_CONDITIONAL(SUPPORT_WIN32, [false])
|
|
||||||
AM_CONDITIONAL(SUPPORT_WAYLAND, [false])
|
|
||||||
|
|
||||||
|
|
||||||
dnl ================================================================
|
dnl ================================================================
|
||||||
dnl Compiler stuff.
|
dnl Compiler stuff.
|
||||||
dnl ================================================================
|
dnl ================================================================
|
||||||
|
Loading…
Reference in New Issue
Block a user