79f20d08b6
The compositor side wayland support enabling us to create textures from wayland buffers needed updating since visuals were removed from the wayland protocol. This also fixes the #ifdef guards for the bind_wayland_display extension in cogl-winsys-egl-feature-functions.h since it was mistakenly checking that client-side wayland support had been enabled which won't be the case. Reviewed-by: Neil Roberts <neil@linux.intel.com>
95 lines
3.8 KiB
C
95 lines
3.8 KiB
C
/*
|
|
* Cogl
|
|
*
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
|
*
|
|
* Copyright (C) 2010 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/>.
|
|
*
|
|
*
|
|
*/
|
|
|
|
/* This can be included multiple times with different definitions for
|
|
* the COGL_WINSYS_FEATURE_* functions.
|
|
*/
|
|
|
|
/* Macro prototypes:
|
|
* COGL_WINSYS_FEATURE_BEGIN (name, namespaces, extension_names,
|
|
* implied_private_egl_feature_flags)
|
|
* COGL_WINSYS_FEATURE_FUNCTION (return_type, function_name,
|
|
* (arguments))
|
|
* ...
|
|
* COGL_WINSYS_FEATURE_END ()
|
|
*
|
|
* Note: You can list multiple namespace and extension names if the
|
|
* corresponding _FEATURE_FUNCTIONS have the same semantics accross
|
|
* the different extension variants.
|
|
*
|
|
* XXX: NB: Don't add a trailing semicolon when using these macros
|
|
*/
|
|
|
|
COGL_WINSYS_FEATURE_BEGIN (swap_region,
|
|
"NOK\0",
|
|
"swap_region\0",
|
|
COGL_EGL_WINSYS_FEATURE_SWAP_REGION)
|
|
COGL_WINSYS_FEATURE_FUNCTION (EGLBoolean, eglSwapBuffersRegion,
|
|
(EGLDisplay dpy,
|
|
EGLSurface surface,
|
|
EGLint numRects,
|
|
const EGLint *rects))
|
|
COGL_WINSYS_FEATURE_END ()
|
|
/* XXX: These macros can't handle falling back to looking for
|
|
* EGL_KHR_image if EGL_KHR_image_base and EGL_KHR_image_pixmap aren't
|
|
* found... */
|
|
#ifdef EGL_KHR_image_base
|
|
COGL_WINSYS_FEATURE_BEGIN (image_base,
|
|
"KHR\0",
|
|
"image_base\0",
|
|
0)
|
|
COGL_WINSYS_FEATURE_FUNCTION (EGLImageKHR, eglCreateImage,
|
|
(EGLDisplay dpy,
|
|
EGLContext ctx,
|
|
EGLenum target,
|
|
EGLClientBuffer buffer,
|
|
const EGLint *attrib_list))
|
|
COGL_WINSYS_FEATURE_FUNCTION (EGLBoolean, eglDestroyImage,
|
|
(EGLDisplay dpy,
|
|
EGLImageKHR image))
|
|
COGL_WINSYS_FEATURE_END ()
|
|
#endif
|
|
COGL_WINSYS_FEATURE_BEGIN (image_pixmap,
|
|
"KHR\0",
|
|
"image_pixmap\0",
|
|
COGL_EGL_WINSYS_FEATURE_EGL_IMAGE_FROM_X11_PIXMAP)
|
|
COGL_WINSYS_FEATURE_END ()
|
|
#ifdef EGL_WL_bind_wayland_display
|
|
COGL_WINSYS_FEATURE_BEGIN (bind_wayland_display,
|
|
"WL\0",
|
|
"bind_wayland_display\0",
|
|
COGL_EGL_WINSYS_FEATURE_EGL_IMAGE_FROM_WAYLAND_BUFFER)
|
|
COGL_WINSYS_FEATURE_FUNCTION (EGLImageKHR, eglBindWaylandDisplay,
|
|
(EGLDisplay dpy,
|
|
struct wl_display *wayland_display))
|
|
COGL_WINSYS_FEATURE_FUNCTION (EGLBoolean, eglUnbindWaylandDisplay,
|
|
(EGLDisplay dpy,
|
|
struct wl_display *wayland_display))
|
|
COGL_WINSYS_FEATURE_END ()
|
|
#endif
|
|
COGL_WINSYS_FEATURE_BEGIN (surfaceless_opengl,
|
|
"KHR\0",
|
|
"surfaceless_opengl\0",
|
|
COGL_EGL_WINSYS_FEATURE_SURFACELESS_OPENGL)
|
|
COGL_WINSYS_FEATURE_END ()
|