[mutter/bilelmoussaoui/meson-without-x11: 2/2] cogl: Fix build without X11
- From: Bilal Elmoussaoui <bilelmoussaoui src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/bilelmoussaoui/meson-without-x11: 2/2] cogl: Fix build without X11
- Date: Wed, 6 Apr 2022 12:49:15 +0000 (UTC)
commit f0b7a4978f8fbf9de560e05d1426be1d809f62ae
Author: Christian Rauch <rauch christian gmx de>
Date: Tue Apr 5 15:01:29 2022 +0200
cogl: Fix build without X11
cogl/cogl/cogl-driver.h | 1 +
cogl/cogl/cogl-fence.c | 2 +-
cogl/test-fixtures/test-utils.c | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/cogl/cogl/cogl-driver.h b/cogl/cogl/cogl-driver.h
index aeabfe0e75..a87e57285e 100644
--- a/cogl/cogl/cogl-driver.h
+++ b/cogl/cogl/cogl-driver.h
@@ -36,6 +36,7 @@
#include "cogl-framebuffer-private.h"
#include "cogl-attribute-private.h"
#include "cogl-sampler-cache-private.h"
+#include "cogl-texture-private.h"
typedef struct _CoglDriverVtable CoglDriverVtable;
diff --git a/cogl/cogl/cogl-fence.c b/cogl/cogl/cogl-fence.c
index b2fcd148a8..a4d1ce7304 100644
--- a/cogl/cogl/cogl-fence.c
+++ b/cogl/cogl/cogl-fence.c
@@ -29,9 +29,9 @@
#include "cogl-config.h"
+#include "cogl-context-private.h"
#include "cogl-fence.h"
#include "cogl-fence-private.h"
-#include "cogl-context-private.h"
#include "winsys/cogl-winsys-private.h"
#define FENCE_CHECK_TIMEOUT 5000 /* microseconds */
diff --git a/cogl/test-fixtures/test-utils.c b/cogl/test-fixtures/test-utils.c
index dad881948d..21e31346ce 100644
--- a/cogl/test-fixtures/test-utils.c
+++ b/cogl/test-fixtures/test-utils.c
@@ -99,7 +99,7 @@ create_onscreen (CoglContext *cogl_context,
break;
#endif
case COGL_WINSYS_ID_EGL_XLIB:
-#ifdef COGL_HAS_EGL_SUPPORT
+#ifdef COGL_HAS_EGL_PLATFORM_XLIB_SUPPORT
return COGL_ONSCREEN (cogl_onscreen_xlib_new (cogl_context,
width, height));
#else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]