amdxc: Support FSR 4.0.2

configure.ac

@@ -62,6 +62,7 @@ AC_ARG_WITH(udev,      AS_HELP_STRING([--without-udev],[do not use udev (plug an
 AC_ARG_WITH(unwind,    AS_HELP_STRING([--without-unwind],[do not use the libunwind library (exception handling)]))
 AC_ARG_WITH(usb,       AS_HELP_STRING([--without-usb],[do not use the libusb library]))
 AC_ARG_WITH(v4l2,      AS_HELP_STRING([--without-v4l2],[do not use v4l2 (video capture)]))
+AC_ARG_WITH(vosk,      AS_HELP_STRING([--without-vosk],[do not use Vosk]))
 AC_ARG_WITH(vulkan,    AS_HELP_STRING([--without-vulkan],[do not use Vulkan]))
 AC_ARG_WITH(wayland,   AS_HELP_STRING([--without-wayland],[do not build the Wayland driver]))
 AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]),
@@ -446,7 +447,8 @@ AC_CHECK_HEADERS(\
 	syscall.h \
 	utime.h \
 	valgrind/memcheck.h \
-	valgrind/valgrind.h
+	valgrind/valgrind.h \
+	vosk_api.h
 )
 AC_HEADER_MAJOR()
 
@@ -1886,6 +1888,14 @@ then
     WINE_WARNING([No sound system was found. Windows applications will be silent.])
 fi
 
+dnl **** Check for Vosk ****
+if test x$with_vosk != xno
+then
+    WINE_CHECK_SONAME(vosk,vosk_recognizer_new)
+fi
+WINE_NOTICE_WITH(vosk,[test x$ac_cv_lib_soname_vosk = x],
+                 [libvosk ${notice_platform}development files not found, speech recognition won't be supported.])
+
 dnl *** Check for Vulkan ***
 if test "x$with_vulkan" != "xno"
 then
@@ -2446,6 +2456,7 @@ WINE_CONFIG_MAKEFILE(dlls/advpack)
 WINE_CONFIG_MAKEFILE(dlls/advpack/tests)
 WINE_CONFIG_MAKEFILE(dlls/amsi)
 WINE_CONFIG_MAKEFILE(dlls/amd_ags_x64)
+WINE_CONFIG_MAKEFILE(dlls/amdxc64)
 WINE_CONFIG_MAKEFILE(dlls/amstream)
 WINE_CONFIG_MAKEFILE(dlls/amstream/tests)
 WINE_CONFIG_MAKEFILE(dlls/apisetschema)

dlls/advapi32/security.c

@@ -3143,7 +3143,7 @@ DWORD WINAPI TreeSetNamedSecurityInfoW(WCHAR *name, SE_OBJECT_TYPE type, SECURIT
     FIXME("(%s, %d, %lu, %p, %p, %p, %p, %lu, %p, %d, %p) stub\n",
           debugstr_w(name), type, info, owner, group, dacl, sacl, action, progress, pis, args);
 
-    return ERROR_CALL_NOT_IMPLEMENTED;
+    return ERROR_SUCCESS;
 }
 
 /******************************************************************************

dlls/amd_ags_x64/amd_ags.h

@@ -475,6 +475,7 @@ typedef enum AsicFamily
     AsicFamily_RDNA,                                            ///< AMD RDNA architecture
     AsicFamily_RDNA2,                                           ///< AMD RDNA2 architecture
     AsicFamily_RDNA3,                                           ///< AMD RDNA3 architecture
+    AsicFamily_RDNA4,                                           ///< AMD RDNA4 architecture
 
     AsicFamily_Count                                            ///< Number of enumerated ASIC families
 } AsicFamily;
@@ -987,6 +988,8 @@ AMD_AGS_API AGSReturnCode agsDeInit( AGSContext* context );
 ///
 AMD_AGS_API AGSReturnCode agsDeInitialize( AGSContext* context );
 
+AMD_AGS_API AGSReturnCode agsGetGPUInfo( AGSContext* context, AGSGPUInfo_600 *gpu_info );
+
 ///
 /// Function used to query the number of GPUs used for Crossfire acceleration.
 /// This may be different from the total number of GPUs present in the system.

dlls/amd_ags_x64/amd_ags_x64.spec

@@ -63,3 +63,4 @@
 @ stdcall agsGetGPUMemorySize(ptr long ptr)
 @ stdcall agsGetEyefinityConfigInfo(ptr long ptr ptr ptr)
 @ stdcall agsDriverExtensions_SetCrossfireMode(ptr long)
+@ stdcall agsGetGPUInfo(ptr ptr)

dlls/amd_ags_x64/amd_ags_x64_main.c

@@ -64,6 +64,7 @@ enum amd_ags_version
     AMD_AGS_VERSION_5_4_2,
     AMD_AGS_VERSION_6_0_0,
     AMD_AGS_VERSION_6_1_0,
+    AMD_AGS_VERSION_6_3_0,
 
     AMD_AGS_VERSION_COUNT
 };
@@ -88,34 +89,35 @@ amd_ags_info[AMD_AGS_VERSION_COUNT] =
     {AGS_MAKE_VERSION(5, 4, 2), AGS_MAKE_VERSION(5, 4, 2), sizeof(AGSDeviceInfo_542), sizeof(AGSDX11ReturnedParams_520), AsicFamily_RDNA},
     {AGS_MAKE_VERSION(6, 0, 0), AGS_MAKE_VERSION(6, 0, 1), sizeof(AGSDeviceInfo_600), sizeof(AGSDX11ReturnedParams_600), AsicFamily_RDNA2},
     {AGS_MAKE_VERSION(6, 1, 0), AGS_MAKE_VERSION(6, 2, 0), sizeof(AGSDeviceInfo_600), sizeof(AGSDX11ReturnedParams_600), AsicFamily_RDNA3},
+    {AGS_MAKE_VERSION(6, 3, 0), AGS_MAKE_VERSION(6, 3, 0), sizeof(AGSDeviceInfo_600), sizeof(AGSDX11ReturnedParams_600), AsicFamily_RDNA4},
 };
 
 #define DEF_FIELD(name) {DEVICE_FIELD_##name, {offsetof(AGSDeviceInfo_511, name), offsetof(AGSDeviceInfo_511, name), \
         offsetof(AGSDeviceInfo_511, name), offsetof(AGSDeviceInfo_520, name), \
         offsetof(AGSDeviceInfo_520, name), offsetof(AGSDeviceInfo_540, name), \
         offsetof(AGSDeviceInfo_541, name), offsetof(AGSDeviceInfo_542, name), \
-        offsetof(AGSDeviceInfo_600, name), offsetof(AGSDeviceInfo_600, name)}}
+        offsetof(AGSDeviceInfo_600, name), offsetof(AGSDeviceInfo_600, name), offsetof(AGSDeviceInfo_600, name)}}
 #define DEF_FIELD_520_BELOW(name) {DEVICE_FIELD_##name, {offsetof(AGSDeviceInfo_511, name), offsetof(AGSDeviceInfo_511, name), \
         offsetof(AGSDeviceInfo_511, name), offsetof(AGSDeviceInfo_520, name), \
         offsetof(AGSDeviceInfo_520, name), -1, \
-        -1, -1, -1, -1}}
+        -1, -1, -1, -1, -1}}
 #define DEF_FIELD_520_UP(name) {DEVICE_FIELD_##name, {-1, -1, -1, offsetof(AGSDeviceInfo_520, name), \
         offsetof(AGSDeviceInfo_520, name), offsetof(AGSDeviceInfo_540, name), \
         offsetof(AGSDeviceInfo_541, name), offsetof(AGSDeviceInfo_542, name), \
-        offsetof(AGSDeviceInfo_600, name), offsetof(AGSDeviceInfo_600, name)}}
+        offsetof(AGSDeviceInfo_600, name), offsetof(AGSDeviceInfo_600, name), offsetof(AGSDeviceInfo_600, name)}}
 #define DEF_FIELD_540_UP(name) {DEVICE_FIELD_##name, {-1, -1, -1, -1, \
         -1, offsetof(AGSDeviceInfo_540, name), \
         offsetof(AGSDeviceInfo_541, name), offsetof(AGSDeviceInfo_542, name), \
-        offsetof(AGSDeviceInfo_600, name), offsetof(AGSDeviceInfo_600, name)}}
+        offsetof(AGSDeviceInfo_600, name), offsetof(AGSDeviceInfo_600, name), offsetof(AGSDeviceInfo_600, name)}}
 #define DEF_FIELD_540_600(name) {DEVICE_FIELD_##name, {-1, -1, -1, -1, \
         -1, offsetof(AGSDeviceInfo_540, name), \
         offsetof(AGSDeviceInfo_541, name), offsetof(AGSDeviceInfo_542, name), \
-        -1, -1}}
+        -1, -1, -1}}
 #define DEF_FIELD_600_BELOW(name) {DEVICE_FIELD_##name, {offsetof(AGSDeviceInfo_511, name), offsetof(AGSDeviceInfo_511, name), \
         offsetof(AGSDeviceInfo_511, name), offsetof(AGSDeviceInfo_520, name), \
         offsetof(AGSDeviceInfo_520, name), offsetof(AGSDeviceInfo_540, name), \
         offsetof(AGSDeviceInfo_541, name), offsetof(AGSDeviceInfo_542, name), \
-        -1, -1}}
+        -1, -1, -1}}
 
 #define DEVICE_FIELD_adapterString 0
 #define DEVICE_FIELD_architectureVersion 1
@@ -1057,6 +1059,21 @@ AGSReturnCode WINAPI agsInitialize(int ags_version, const AGSConfiguration *conf
     return AGS_SUCCESS;
 }
 
+AGSReturnCode WINAPI agsGetGPUInfo(AGSContext* context, AGSGPUInfo_600 *gpu_info)
+{
+    TRACE("context %p, gpu_info %p.\n", context, gpu_info);
+
+    if (!context || !gpu_info)
+        return AGS_INVALID_ARGS;
+
+    memset(gpu_info, 0, sizeof(*gpu_info));
+    gpu_info->driverVersion = driver_version;
+    gpu_info->radeonSoftwareVersion  = radeon_version;
+    gpu_info->numDevices = context->device_count;
+    gpu_info->devices = context->devices;
+    return AGS_SUCCESS;
+}
+
 AGSReturnCode WINAPI agsDeInit(AGSContext *context)
 {
     return agsDeInitialize(context);

dlls/amd_ags_x64/unixlib.c

@@ -155,6 +155,7 @@ typedef enum AsicFamily
     AsicFamily_RDNA,                                            ///< AMD RDNA architecture
     AsicFamily_RDNA2,                                           ///< AMD RDNA2 architecture
     AsicFamily_RDNA3,                                           ///< AMD RDNA3 architecture
+    AsicFamily_RDNA4,
 } AsicFamily;
 
 /* Constants from Mesa source. */
@@ -176,6 +177,7 @@ typedef enum AsicFamily
 #define FAMILY_GFX1103 0x94
 #define FAMILY_GFX1150 0x96
 #define FAMILY_MDN     0x97 /* # 151 / Mendocino */
+#define FAMILY_GFX12   0x98
 
 #define ROUND_DIV(value, div) (((value) + (div) / 2) / (div))
 
@@ -220,6 +222,10 @@ static void fill_device_info(struct drm_amdgpu_info_device *info, struct get_dev
         case FAMILY_GFX1150:
             out->asic_family = AsicFamily_RDNA3;
             break;
+
+        case FAMILY_GFX12:
+            out->asic_family = AsicFamily_RDNA4;
+            break;
     }
     TRACE("family %u, erev %#x -> asicFamily %d.\n", info->family, erev, out->asic_family);
     if (out->asic_family == AsicFamily_Unknown && info->family != FAMILY_UNKNOWN)

dlls/amdxc64/Makefile.in

@@ -0,0 +1,9 @@
+MODULE = amdxc64.dll
+IMPORTS = version vulkan-1 user32 gdi32
+IMPORTLIB = amdxc64
+
+EXTRADLLFLAGS = -mno-cygwin
+
+SOURCES = \
+	main.c \
+	amdxc_interfaces.idl \

dlls/amdxc64/amdxc64.spec

@@ -0,0 +1,5 @@
+@ cdecl AmdExtD3DCreateInterface(ptr ptr ptr)
+@ stdcall AmdGetDxcModuleHandle()
+@ stub GetSettingsBlobsAll
+@ stub OpenAdapter12
+@ stub OpenShimInterface