[PATCH xserver] fixup: Actually add the glamor_init compat function

Adam Jackson ajax at redhat.com
Wed Nov 1 20:37:42 UTC 2017


Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 glamor/glamor.h     | 4 ++++
 glamor/glamor_egl.c | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/glamor/glamor.h b/glamor/glamor.h
index 44ad48788..7b2225b0a 100644
--- a/glamor/glamor.h
+++ b/glamor/glamor.h
@@ -350,6 +350,10 @@ extern _X_EXPORT Bool glamor_egl_screen_init(ScreenPtr screen,
 extern _X_EXPORT Bool glamor_glx_screen_init(ScreenPtr screen,
                                              struct glamor_context *glamor_ctx);
 
+/* call glamor_xxx_screen_init instead please */
+extern _X_EXPORT _X_DEPRECATED Bool glamor_init(ScreenPtr screen,
+                                                unsigned int flags);
+
 extern _X_EXPORT int glamor_create_gc(GCPtr gc);
 
 extern _X_EXPORT void glamor_validate_gc(GCPtr gc, unsigned long changes,
diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index 6085c4317..d507e88d2 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -812,3 +812,9 @@ glamor_name_from_pixmap(PixmapPtr pixmap, CARD16 *stride, CARD32 *size)
     }
     return -1;
 }
+
+Bool
+glamor_init(ScreenPtr screen, unsigned int flags)
+{
+    return glamor_api_init(screen, 0, glamor_egl_screen_init);
+}
-- 
2.14.3



More information about the xorg-devel mailing list