From d81e40b20c386a79d643fc6c14c3cfb8351daa09 Mon Sep 17 00:00:00 2001
From: Sil Vilerino <sivileri@microsoft.com>
Date: Tue, 15 Nov 2022 12:04:19 -0500
Subject: [PATCH] frontend/va: Fix WIN32 VA_DRIVER_INIT_FUNC declaration.
 Remove declspec as it uses .def file

Fixes: b557ceb7 ("frontends/va: Add windows VA frontend support via vl_winsys_win32 and libva-win32")
Closes: #7702

Signed-off-by: Sil Vilerino <sivileri@microsoft.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Yonggang Luo <luoyonggang@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19754>
---
 src/gallium/frontends/va/context.c    | 2 +-
 src/gallium/frontends/va/va_private.h | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/gallium/frontends/va/context.c b/src/gallium/frontends/va/context.c
index 0af03799d5c..d02f558cc51 100644
--- a/src/gallium/frontends/va/context.c
+++ b/src/gallium/frontends/va/context.c
@@ -115,7 +115,7 @@ static struct VADriverVTableVPP vtable_vpp =
    &vlVaQueryVideoProcPipelineCaps
 };
 
-PUBLIC VAStatus
+VA_PUBLIC_API VAStatus
 VA_DRIVER_INIT_FUNC(VADriverContextP ctx)
 {
    vlVaDriver *drv;
diff --git a/src/gallium/frontends/va/va_private.h b/src/gallium/frontends/va/va_private.h
index 7c329b14310..08f2fc3044e 100644
--- a/src/gallium/frontends/va/va_private.h
+++ b/src/gallium/frontends/va/va_private.h
@@ -45,6 +45,13 @@
 
 #include "util/u_dynarray.h"
 #include "util/u_thread.h"
+#include "util/detect_os.h"
+
+#if DETECT_OS_WINDOWS
+#define VA_PUBLIC_API
+#else
+#define VA_PUBLIC_API PUBLIC
+#endif
 
 #ifndef VA_RT_FORMAT_YUV420_10
 #define VA_RT_FORMAT_YUV420_10  VA_RT_FORMAT_YUV420_10BPP
@@ -383,9 +390,7 @@ typedef struct {
 } vlVaQualityBits;
 
 // Public functions:
-#ifndef _WIN32
 VAStatus VA_DRIVER_INIT_FUNC(VADriverContextP ctx);
-#endif
 
 // vtable functions:
 VAStatus vlVaTerminate(VADriverContextP ctx);