From 3da712d668d065476b0fee5fcf5aaf33d63cd2d2 Mon Sep 17 00:00:00 2001
From: Mark Thompson <sw@jkqxz.net>
Date: Mon, 19 Jun 2017 19:09:30 +0100
Subject: Add namespace prefix to global DRI functions in libva-x11

Signed-off-by: Mark Thompson <sw@jkqxz.net>
---
 va/x11/dri2_util.c    |  4 ++--
 va/x11/va_dricommon.c | 10 +++++-----
 va/x11/va_dricommon.h | 12 ++++++------
 va/x11/va_x11.c       |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'va/x11')

diff --git a/va/x11/dri2_util.c b/va/x11/dri2_util.c
index 32d616c..5f140f7 100644
--- a/va/x11/dri2_util.c
+++ b/va/x11/dri2_util.c
@@ -166,14 +166,14 @@ dri2Close(VADriverContextP ctx)
 {
     struct dri_state *dri_state = (struct dri_state *)ctx->drm_state;
 
-    free_drawable_hashtable(ctx);
+    va_dri_free_drawable_hashtable(ctx);
 
     if (dri_state->base.fd >= 0)
 	close(dri_state->base.fd);
 }
 
 Bool 
-isDRI2Connected(VADriverContextP ctx, char **driver_name)
+va_isDRI2Connected(VADriverContextP ctx, char **driver_name)
 {
     struct dri_state *dri_state = (struct dri_state *)ctx->drm_state;
     int major, minor;
diff --git a/va/x11/va_dricommon.c b/va/x11/va_dricommon.c
index 379e3d4..8f382ac 100644
--- a/va/x11/va_dricommon.c
+++ b/va/x11/va_dricommon.c
@@ -81,7 +81,7 @@ do_drawable_hash(VADriverContextP ctx, XID drawable)
 }
 
 void
-free_drawable(VADriverContextP ctx, struct dri_drawable* dri_drawable)
+va_dri_free_drawable(VADriverContextP ctx, struct dri_drawable* dri_drawable)
 {
     struct dri_state *dri_state = (struct dri_state *)ctx->drm_state;
     int i = 0;
@@ -96,7 +96,7 @@ free_drawable(VADriverContextP ctx, struct dri_drawable* dri_drawable)
 }
 
 void
-free_drawable_hashtable(VADriverContextP ctx)
+va_dri_free_drawable_hashtable(VADriverContextP ctx)
 {
     struct dri_state *dri_state = (struct dri_state *)ctx->drm_state;
     int i;
@@ -116,13 +116,13 @@ free_drawable_hashtable(VADriverContextP ctx)
 }
 
 struct dri_drawable *
-dri_get_drawable(VADriverContextP ctx, XID drawable)
+va_dri_get_drawable(VADriverContextP ctx, XID drawable)
 {
     return do_drawable_hash(ctx, drawable);
 }
 
 void 
-dri_swap_buffer(VADriverContextP ctx, struct dri_drawable *dri_drawable)
+va_dri_swap_buffer(VADriverContextP ctx, struct dri_drawable *dri_drawable)
 {
     struct dri_state *dri_state = (struct dri_state *)ctx->drm_state;
 
@@ -130,7 +130,7 @@ dri_swap_buffer(VADriverContextP ctx, struct dri_drawable *dri_drawable)
 }
 
 union dri_buffer *
-dri_get_rendering_buffer(VADriverContextP ctx, struct dri_drawable *dri_drawable)
+va_dri_get_rendering_buffer(VADriverContextP ctx, struct dri_drawable *dri_drawable)
 {
     struct dri_state *dri_state = (struct dri_state *)ctx->drm_state;
     
diff --git a/va/x11/va_dricommon.h b/va/x11/va_dricommon.h
index eb6ddad..1566e85 100644
--- a/va/x11/va_dricommon.h
+++ b/va/x11/va_dricommon.h
@@ -84,11 +84,11 @@ struct dri_state
 #endif
 };
 
-Bool isDRI2Connected(VADriverContextP ctx, char **driver_name);
-void free_drawable(VADriverContextP ctx, struct dri_drawable* dri_drawable);
-void free_drawable_hashtable(VADriverContextP ctx);
-struct dri_drawable *dri_get_drawable(VADriverContextP ctx, XID drawable);
-void dri_swap_buffer(VADriverContextP ctx, struct dri_drawable *dri_drawable);
-union dri_buffer *dri_get_rendering_buffer(VADriverContextP ctx, struct dri_drawable *dri_drawable);
+Bool va_isDRI2Connected(VADriverContextP ctx, char **driver_name);
+void va_dri_free_drawable(VADriverContextP ctx, struct dri_drawable* dri_drawable);
+void va_dri_free_drawable_hashtable(VADriverContextP ctx);
+struct dri_drawable *va_dri_get_drawable(VADriverContextP ctx, XID drawable);
+void va_dri_swap_buffer(VADriverContextP ctx, struct dri_drawable *dri_drawable);
+union dri_buffer *va_dri_get_rendering_buffer(VADriverContextP ctx, struct dri_drawable *dri_drawable);
 
 #endif /* _VA_DRICOMMON_H_ */
diff --git a/va/x11/va_x11.c b/va/x11/va_x11.c
index fa41cab..ed06826 100644
--- a/va/x11/va_x11.c
+++ b/va/x11/va_x11.c
@@ -81,7 +81,7 @@ static VAStatus va_DRI2GetDriverName (
 {
     VADriverContextP ctx = pDisplayContext->pDriverContext;
 
-    if (!isDRI2Connected(ctx, driver_name))
+    if (!va_isDRI2Connected(ctx, driver_name))
         return VA_STATUS_ERROR_UNKNOWN;
 
     return VA_STATUS_SUCCESS;
-- 
cgit v1.2.1