a93e789a7c
Avoid conflicting client/server wayland includes
...
This avoids including wayland-server.h in cogl-display-private.h which
avoid lots of compile time warnings that wl_buffer is deprecated. The
problem is that wl_buffer is also exposed in the client side headers and
isn't deprecated for clients. If we end up including the client and
server headers in the same compilation unit we can get conflicting
definitions.
Reviewed-by: Neil Roberts <neil@linux.intel.com >
(cherry picked from commit 60fcd9c87cf5d8ae8c41134217ee0e1fa2fbd46e)
2013-10-28 16:34:57 +00:00
8392420244
wayland-server: Use wl_resource instead of wl_buffer
...
wl_buffer has been deprecated in the server API and instead
compositors should be directly passing the wl_resource pointer to
eglQueryWaylandBuffer.
Reviewed-by: Robert Bragg <robert@linux.intel.com >
(cherry picked from commit f13278bcf3f1475b7afc7d55a5218f409d119658)
2013-10-24 17:39:40 +01:00
9bbb8a79c3
Fix build on big-endian
...
Commit 50d1285b
updated the wl_shm enum values but left
one out. Update it to fix the build on big-endian.
https://bugzilla.gnome.org/show_bug.cgi?id=710135
Reviewed-by: Neil Roberts <neil@linux.intel.com >
(cherry picked from commit 9246286846d0428b03e646b2f5ec14f0eff4edc6)
2013-10-15 19:07:50 +01:00
fa855b7c45
Start clearly separating deprecated code
...
This makes a start on clearly factoring the deprecated code of core Cogl
into a deprecated/ directory. Ideally we want to get to the point where
all code here can be re-worked in terms of the public 2.0 api so that it
can be kept indefinitely for cogl 1.x api compatibility without
cluttering the core code base itself. If we can do this then we can
avoid maintaining the Cogl 1.x branches in parallel with master which
would reduce the maintenance effort.
2013-09-23 18:38:49 +01:00
3b14acdbcc
remove spurious COGL_GTYPE_DEFINE_CLASS reference
...
Commit 7b25c8f5ca
mistakenly added a reference to a
COGL_GTYPE_DEFINE_CLASS() macro that does not yet exist so this patch
removes it.
Reviewed-by: Neil Roberts <neil@linux.intel.com >
2013-09-23 18:37:29 +01:00
d33f8ca070
texture: add missing annotations
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:31 +01:00
fbba3478a8
fence: add scope annotation
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:31 +01:00
84bdd679df
buffer: add missing transfer annotations
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:31 +01:00
c1597a3364
pixel-buffer: add missing transfer annotation
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:31 +01:00
bd69f5963c
frame-info: add missing annotation
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:31 +01:00
232842c1f7
matrix-stack: add missing transfer annotation
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:31 +01:00
28e37775c0
matrix: add missing transfer annotation
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:31 +01:00
59fa8b22bd
index-buffer: add missing transfer annotation
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:31 +01:00
8dc7480002
attribute-buffer: add missing annotation
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:31 +01:00
de0cb3aba2
attribute-buffer: add missing transfer annotations
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:31 +01:00
7583f5fc3f
attribute: add constructor annotation
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:31 +01:00
7b25c8f5ca
attribute: add missing transfer annotations
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:31 +01:00
db513174f0
primitive: add missing description
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:31 +01:00
34838553c0
primitive: add scope annotation
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:31 +01:00
dc5b440f07
primitive: add missing transfer annotations
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:31 +01:00
5516235921
display: add missing transfer annotation
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:31 +01:00
2008493a46
renderer: add missing scope annotation
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:31 +01:00
c042051c01
renderer: add missing transfer annotation
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:31 +01:00
3ad8307ab3
context: add scope annotation
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:31 +01:00
d25b5f0314
context: improve constructor annotation
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:31 +01:00
9d2fc82077
onscreen: add scope annotations
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:31 +01:00
6ed5a43b82
onscreen: add constructor annotation
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:31 +01:00
777be3895d
onscreen: add missing transfer annotation
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:31 +01:00
6e3e14bb50
framebuffer: add missing transfer annotation
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:31 +01:00
95b0c4c558
bitmap: add missing annotations
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:31 +01:00
7cc83d58a2
sub-texture: add missing transfer annotaion
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:30 +01:00
7fa9b0dfdd
atlas-texture: add missing transfer annontations
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:30 +01:00
1cb2747ea0
texture-rectangle: add missing transfer annotations
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:30 +01:00
dfa0bdc9ed
texture-3d: add missing transfer annotations
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:30 +01:00
c1f6ec77b5
texture-2d-sliced: add missing transfer annotations
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:30 +01:00
c56e87043d
texture-2d: add missing annotations
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:30 +01:00
6b7c543663
pipeline: add scope annotation
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:30 +01:00
44f17fbd8d
pipeline: add missing transfer annotations
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:30 +01:00
b53de33521
object: use GLib's DestroyNotify if compiled with GLib
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:30 +01:00
a34f4f46b6
object: add missing annotation
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-23 15:02:30 +01:00
b635b68756
egl: don't bind the wayland display if the extension is not available
...
When running in a purely swrast environment (such as with
LIBGL_ALWAYS_SOFTWARE), the extension is not exposed by mesa,
but wayland is still possible with wl_shm.
https://bugzilla.gnome.org/show_bug.cgi?id=704750
Reviewed-by: Neil Roberts <neil@linux.intel.com >
(cherry picked from commit 8d4e4b0e8062708cece4d4c929abccc492ee21cc)
2013-09-16 18:57:23 +01:00
f3c930ceb7
glib-source: fix argument description
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-06 18:42:10 +01:00
31246d418f
attribute: fix argument description
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-06 18:42:10 +01:00
4e11b784f0
atlas-texture: fix argument description
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-06 18:42:10 +01:00
fd03b622b0
onscreen-template: fix argument description
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-06 18:42:10 +01:00
58a5251868
texture-rectangle: fix argument description
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-06 18:42:10 +01:00
b38a7112d9
texture-2d-gl: fix argument description
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-06 18:42:09 +01:00
015d928be5
texture-2d-sliced: fix argument description
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-06 18:42:09 +01:00
cf3a12f282
pipeline: fix method description
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-06 18:42:09 +01:00
9cbf1e8a08
quaternion: fix structure introspection annotation
...
Reviewed-by: Robert Bragg <robert@linux.intel.com >
2013-09-06 18:42:09 +01:00