brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cogl: remove OSX/WIN32 specific bits in favour of a stub winsys

Browse Source 
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:
Robert Bragg 2011-04-18 17:45:36 +01:00
parent 3d0a853c6f
commit 7a3d06c55c
6 changed files with 8 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clutter/cogl/cogl/Makefile.am
View File

@ -342,14 +342,8 @@ if SUPPORT_EGL_PLATFORM_GDL
cogl_sources_c += \
$(srcdir)/winsys/cogl-winsys-egl.c
endif
if SUPPORT_WIN32
if SUPPORT_STUB
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
endif

35
clutter/cogl/cogl/winsys/cogl-winsys-osx.c
View File

@ -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;
}

5
clutter/cogl/cogl/winsys/cogl-winsys-stub.c
View File

@ -32,6 +32,11 @@
* calls into the winsys layer with #ifdef COGL_HAS_FULL_WINSYS
*/
CoglFuncPtr
_cogl_winsys_get_proc_address (const char *name)
{
return NULL;
}
void
_cogl_winsys_onscreen_swap_buffers (CoglOnscreen *onscreen)

35
clutter/cogl/cogl/winsys/cogl-winsys-win32.c
View File

@ -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);
}

6
clutter/cogl/configure.ac
View File

@ -399,6 +399,7 @@ AS_IF([test "x$enable_stub_winsys" = "xyes"],
GL_WINSYS_APIS="$GL_WINSYS_APIS stub"
ALLOW_GLX=no
])
AM_CONDITIONAL(SUPPORT_STUB, [test "x$enable_stub_winsys" = "xyes"])
AC_ARG_ENABLE(
[glx],
@ -564,11 +565,6 @@ AM_CONDITIONAL(SUPPORT_XLIB, [test "x$SUPPORT_XLIB" = "xyes"])
AM_CONDITIONAL(COGL_STANDALONE_BUILD, [true])
AM_CONDITIONAL(SUPPORT_OSX, [false])
AM_CONDITIONAL(SUPPORT_WIN32, [false])
AM_CONDITIONAL(SUPPORT_WAYLAND, [false])
dnl ================================================================
dnl Compiler stuff.
dnl ================================================================

2
clutter/win32/clutter-backend-win32.c
View File

@ -229,7 +229,7 @@ clutter_backend_win32_get_features (ClutterBackend *backend)
CLUTTER_NOTE (BACKEND, "vblank sync: left at default at user request");
else if (cogl_clutter_check_extension ("WGL_EXT_swap_control", extensions)
&& (swap_interval = (SwapIntervalProc)
cogl_get_proc_address ("wglSwapIntervalEXT")))
wglGetProcAddress ((LPCSTR) "wglSwapIntervalEXT")))
{
/* According to the specification for the WGL_EXT_swap_control
extension the default swap interval is 1 anyway, so if no