[Libva] [PATCH 15/16] replace WL to Wl

Zhao Halley halley.zhao at intel.com
Tue Jun 5 02:07:03 PDT 2012


From: Zhao halley <halley.zhao at intel.com>

---
 test/common/va_display_wayland.c     |    2 +-
 test/putsurface/putsurface_wayland.c |    2 +-
 va/wayland/va_wayland.c              |   20 ++++++++++----------
 va/wayland/va_wayland.h              |    2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/test/common/va_display_wayland.c b/test/common/va_display_wayland.c
index 1a32068..eef032c 100755
--- a/test/common/va_display_wayland.c
+++ b/test/common/va_display_wayland.c
@@ -94,7 +94,7 @@ va_open_display_wayland(void)
         d->ref_count = 1;
         g_display = d;
     }
-    return vaGetDisplayWL(d->display);
+    return vaGetDisplayWl(d->display);
 }
 
 static void
diff --git a/test/putsurface/putsurface_wayland.c b/test/putsurface/putsurface_wayland.c
index 2386e0c..70a52e7 100755
--- a/test/putsurface/putsurface_wayland.c
+++ b/test/putsurface/putsurface_wayland.c
@@ -56,7 +56,7 @@ va_put_surface(
 static inline VADisplay
 vaGetDisplay(NativeDisplay native_dpy)
 {
-    return vaGetDisplayWL(native_dpy);
+    return vaGetDisplayWl(native_dpy);
 }
 
 static VAStatus
diff --git a/va/wayland/va_wayland.c b/va/wayland/va_wayland.c
index 8f339cd..a9ebc1e 100755
--- a/va/wayland/va_wayland.c
+++ b/va/wayland/va_wayland.c
@@ -72,10 +72,10 @@ va_DisplayContextDestroy(VADisplayContextP pDisplayContext)
 
     pDriverContext = pDisplayContext->pDriverContext;
     if (pDriverContext) {
-        VADisplayContextWaylandP const pDisplayContextWL =
+        VADisplayContextWaylandP const pDisplayContextWl =
             pDisplayContext->opaque;
-        if (pDisplayContextWL && pDisplayContextWL->finalize)
-            pDisplayContextWL->finalize(pDisplayContext);
+        if (pDisplayContextWl && pDisplayContextWl->finalize)
+            pDisplayContextWl->finalize(pDisplayContext);
         free(pDriverContext->vtable_wayland);
         pDriverContext->vtable_wayland = NULL;
         free(pDriverContext);
@@ -103,10 +103,10 @@ static const VADisplayContextInitFunc g_display_context_init_funcs[] = {
 };
 
 VADisplay
-vaGetDisplayWL(struct wl_display *display)
+vaGetDisplayWl(struct wl_display *display)
 {
     VADisplayContextP pDisplayContext = NULL;
-    VADisplayContextWaylandP pDisplayContextWL;
+    VADisplayContextWaylandP pDisplayContextWl;
     VADriverContextP pDriverContext;
     VADisplayContextInitFunc init_backend;
     struct VADriverVTableWayland *vtable;
@@ -134,18 +134,18 @@ vaGetDisplayWL(struct wl_display *display)
         goto error;
     pDriverContext->vtable_wayland = vtable;
 
-    pDisplayContextWL = calloc(1, sizeof(*pDisplayContextWL));
-    if (!pDisplayContextWL)
+    pDisplayContextWl = calloc(1, sizeof(*pDisplayContextWl));
+    if (!pDisplayContextWl)
         goto error;
-    pDisplayContext->opaque = pDisplayContextWL;
+    pDisplayContext->opaque = pDisplayContextWl;
 
     init_backend = NULL;
     for (i = 0; g_display_context_init_funcs[i] != NULL; i++) {
         init_backend = g_display_context_init_funcs[i];
         if (init_backend(pDisplayContext))
             break;
-        if (pDisplayContextWL->finalize)
-            pDisplayContextWL->finalize(pDisplayContext);
+        if (pDisplayContextWl->finalize)
+            pDisplayContextWl->finalize(pDisplayContext);
         init_backend = NULL;
     }
     if (!init_backend)
diff --git a/va/wayland/va_wayland.h b/va/wayland/va_wayland.h
index d49d7e2..2186eec 100755
--- a/va/wayland/va_wayland.h
+++ b/va/wayland/va_wayland.h
@@ -64,7 +64,7 @@ extern "C" {
  * @return the VA display
  */
 VADisplay
-vaGetDisplayWL(struct wl_display *display);
+vaGetDisplayWl(struct wl_display *display);
 
 /**
  * \brief create a wl_buffer which is wraped from va_surface
-- 
1.7.5.4



More information about the Libva mailing list