[PATCH weston 02/10] gl-renderer: fix build with --disable-egl

Jonny Lamb jonny.lamb at collabora.co.uk
Tue Mar 24 05:12:01 PDT 2015


Reviewed-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
---
 src/compositor-drm.c | 3 ++-
 src/gl-renderer.h    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/compositor-drm.c b/src/compositor-drm.c
index c0d0c84..8471a35 100644
--- a/src/compositor-drm.c
+++ b/src/compositor-drm.c
@@ -1626,7 +1626,8 @@ drm_output_init_egl(struct drm_output *output, struct drm_compositor *ec)
 	}
 
 	if (gl_renderer->output_create(&output->base,
-				       output->surface, output->surface,
+				       (EGLNativeDisplayType)output->surface,
+				       output->surface,
 				       gl_renderer->opaque_attribs,
 				       &format) < 0) {
 		weston_log("failed to create gl renderer output state\n");
diff --git a/src/gl-renderer.h b/src/gl-renderer.h
index d4da567..9e4b220 100644
--- a/src/gl-renderer.h
+++ b/src/gl-renderer.h
@@ -32,6 +32,7 @@
 #else
 
 typedef int EGLint;
+typedef int EGLenum;
 typedef void *EGLDisplay;
 typedef void *EGLSurface;
 typedef intptr_t EGLNativeDisplayType;
-- 
2.1.4



More information about the wayland-devel mailing list