From 3fa8169353b680a49b3fa9255c750c7d17f51535 Mon Sep 17 00:00:00 2001
From: Vincent Wei <vincent@minigui.org>
Date: Sun, 15 Mar 2020 10:49:04 +0800
Subject: [PATCH] define backward compatible APIs for drmCreateDCFromXXX

---
 include/gdi.h    | 30 +++++++++++++++++++++++++++---
 src/newgdi/gdi.c |  6 +++---
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/include/gdi.h b/include/gdi.h
index a9fb0c45..6d0cb9e1 100644
--- a/include/gdi.h
+++ b/include/gdi.h
@@ -14395,10 +14395,18 @@ MG_EXPORT BOOL drmGetSurfaceInfo (GHANDLE video, HDC hdc, DrmSurfaceInfo* info);
  *
  * \return The handle to the memory DC for success, HDC_INVALID for failure.
  */
-MG_EXPORT HDC drmCreateDCFromName (GHANDLE video,
+MG_EXPORT HDC drmCreateDCFromNameEx (GHANDLE video,
         uint32_t name, uint32_t drm_format, off_t offset,
         uint32_t width, uint32_t height, uint32_t pitch);
 
+static inline HDC drmCreateDCFromName (GHANDLE video,
+        uint32_t name, uint32_t drm_format,
+        uint32_t width, uint32_t height, uint32_t pitch)
+{
+    return drmCreateDCFromNameEx (video,
+        name, drm_format, 0, width, height, pitch);
+}
+
 /**
  * This function creates a memory DC with a DRM surface which is created by
  * a foreign process and identified by a PRIME file descriptor.
@@ -14414,10 +14422,18 @@ MG_EXPORT HDC drmCreateDCFromName (GHANDLE video,
  *
  * \return The handle to the memory DC for success, HDC_INVALID for failure.
  */
-MG_EXPORT HDC drmCreateDCFromPrimeFd (GHANDLE video,
+MG_EXPORT HDC drmCreateDCFromPrimeFdEx (GHANDLE video,
         int prime_fd, size_t size, uint32_t drm_format, off_t offset,
         uint32_t width, uint32_t height, uint32_t pitch);
 
+static inline HDC drmCreateDCFromPrimeFd (GHANDLE video,
+        int prime_fd, size_t size, uint32_t drm_format,
+        uint32_t width, uint32_t height, uint32_t pitch)
+{
+    return drmCreateDCFromPrimeFdEx (video,
+        prime_fd, size, drm_format, 0, width, height, pitch);
+}
+
 /**
  * This function creates a memory DC with a DRM surface which is created by
  * a foreign graphics component.
@@ -14433,10 +14449,18 @@ MG_EXPORT HDC drmCreateDCFromPrimeFd (GHANDLE video,
  *
  * \return The handle to the memory DC for success, HDC_INVALID for failure.
  */
-MG_EXPORT HDC drmCreateDCFromHandle (GHANDLE video,
+MG_EXPORT HDC drmCreateDCFromHandleEx (GHANDLE video,
         uint32_t handle, size_t size, uint32_t drm_format, off_t offset,
         uint32_t width, uint32_t height, uint32_t pitch);
 
+static inline HDC drmCreateDCFromHandle (GHANDLE video,
+        uint32_t handle, size_t size, uint32_t drm_format,
+        uint32_t width, uint32_t height, uint32_t pitch)
+{
+    return drmCreateDCFromHandleEx (video,
+        handle, size, drm_format, 0, width, height, pitch);
+}
+
 /** @} end of gdi_drm_fns */
 
 #endif /* _MGGAL_DRM */
diff --git a/src/newgdi/gdi.c b/src/newgdi/gdi.c
index 5f3306c7..ea53ad64 100644
--- a/src/newgdi/gdi.c
+++ b/src/newgdi/gdi.c
@@ -4089,7 +4089,7 @@ BOOL drmGetSurfaceInfo (GHANDLE video, HDC hdc, DrmSurfaceInfo* info)
     return __drm_get_surface_info(pdc->surface, info);
 }
 
-HDC drmCreateDCFromName (GHANDLE video, uint32_t name, uint32_t drm_format,
+HDC drmCreateDCFromNameEx (GHANDLE video, uint32_t name, uint32_t drm_format,
         off_t offset, uint32_t width, uint32_t height, uint32_t pitch)
 {
     PDC pmem_dc = NULL;
@@ -4138,7 +4138,7 @@ HDC drmCreateDCFromName (GHANDLE video, uint32_t name, uint32_t drm_format,
     return (HDC)pmem_dc;
 }
 
-HDC drmCreateDCFromHandle (GHANDLE video, uint32_t handle, size_t size,
+HDC drmCreateDCFromHandleEx (GHANDLE video, uint32_t handle, size_t size,
         uint32_t drm_format, off_t offset,
         uint32_t width, uint32_t height, uint32_t pitch)
 {
@@ -4188,7 +4188,7 @@ HDC drmCreateDCFromHandle (GHANDLE video, uint32_t handle, size_t size,
     return (HDC)pmem_dc;
 }
 
-HDC drmCreateDCFromPrimeFd (GHANDLE video, int prime_fd, size_t size,
+HDC drmCreateDCFromPrimeFdEx (GHANDLE video, int prime_fd, size_t size,
         uint32_t drm_format, off_t offset,
         uint32_t width, uint32_t height, uint32_t pitch)
 {