1ad0e81b7b
The Wayland server API has changed so that wl_shm_buffer is no longer a type of wl_buffer and it instead must be retrieved directly from the resource. cogl_wayland_texture_2d_new_from_buffer now takes a resource pointer instead of directly taking a wl_buffer and it will do different things depending on whether it can get a wl_shm_buffer out of the resource instead of trying to query the buffer type. Cogland has also been updated so that it tracks a resource for buffers of surfaces instead of directly tracking a wl_buffer. This are pointed to by a new CoglandBuffer struct which can be referenced by a CoglandBufferReference. The WL_BUFFER_RELEASE event will be posted when the last reference to the buffer is removed instead of directly whenever a new buffer is attached. This is similar to how Weston works. https://bugzilla.gnome.org/show_bug.cgi?id=702999 Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 9b35e1651ad0e46ed489893b60563e2c25457701) Conflicts: examples/cogland.c
84 lines
2.7 KiB
C
84 lines
2.7 KiB
C
/*
|
|
* Cogl
|
|
*
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
|
*
|
|
* Copyright (C) 2012 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/>.
|
|
*
|
|
*/
|
|
|
|
#ifndef __COGL_WAYLAND_SERVER_H
|
|
#define __COGL_WAYLAND_SERVER_H
|
|
|
|
#include <wayland-server.h>
|
|
|
|
#define __COGL_H_INSIDE__
|
|
#include <cogl/cogl-context.h>
|
|
#include <cogl/cogl-texture-2d.h>
|
|
|
|
COGL_BEGIN_DECLS
|
|
|
|
/**
|
|
* cogl_wayland_display_set_compositor_display:
|
|
* @display: a #CoglDisplay
|
|
* @wayland_display: A compositor's Wayland display pointer
|
|
*
|
|
* Informs Cogl of a compositor's Wayland display pointer. This
|
|
* enables Cogl to register private wayland extensions required to
|
|
* pass buffers between the clients and compositor.
|
|
*
|
|
* Since: 1.10
|
|
* Stability: unstable
|
|
*/
|
|
void
|
|
cogl_wayland_display_set_compositor_display (CoglDisplay *display,
|
|
struct wl_display *wayland_display);
|
|
|
|
/**
|
|
* cogl_wayland_texture_2d_new_from_buffer:
|
|
* @ctx: A #CoglContext
|
|
* @buffer: A Wayland resource for a buffer
|
|
* @error: A #CoglError for exceptions
|
|
*
|
|
* Uploads the @buffer referenced by the given Wayland resource to a
|
|
* #CoglTexture2D. The buffer resource may refer to a wl_buffer or a
|
|
* wl_shm_buffer.
|
|
*
|
|
* <note>The results are undefined for passing an invalid @buffer
|
|
* pointer</note>
|
|
* <note>It is undefined if future updates to @buffer outside the
|
|
* control of Cogl will affect the allocated #CoglTexture2D. In some
|
|
* cases the contents of the buffer are copied (such as shm buffers),
|
|
* and in other cases the underlying storage is re-used directly (such
|
|
* as drm buffers)</note>
|
|
*
|
|
* Returns: A newly allocated #CoglTexture2D, or if Cogl could not
|
|
* validate the @buffer in some way (perhaps because of
|
|
* an unsupported format) it will return %NULL and set
|
|
* @error.
|
|
*
|
|
* Since: 1.10
|
|
* Stability: unstable
|
|
*/
|
|
CoglTexture2D *
|
|
cogl_wayland_texture_2d_new_from_buffer (CoglContext *ctx,
|
|
struct wl_resource *buffer,
|
|
CoglError **error);
|
|
|
|
COGL_END_DECLS
|
|
|
|
#endif /* __COGL_WAYLAND_SERVER_H */
|