Przeglądaj źródła

xr: Add fallback for SDL_PROP_GPU_DEVICE_CREATE_XR_APPLICATION_NAME_STRING.

It'll use SDL_GetAppMetadataProperty(SDL_PROP_APP_METADATA_NAME_STRING) if
necessary now.
Ryan C. Gordon 1 dzień temu
rodzic
commit
59a302e601
1 zmienionych plików z 5 dodań i 2 usunięć
  1. 5 2
      src/gpu/xr/SDL_gpu_openxr.c

+ 5 - 2
src/gpu/xr/SDL_gpu_openxr.c

@@ -157,8 +157,11 @@ XrResult SDL_OPENXR_INTERNAL_GPUInitOpenXR(
     xrInstanceCreateInfo.next = &instanceCreateInfoAndroid;
     xrInstanceCreateInfo.next = &instanceCreateInfoAndroid;
 #endif
 #endif
 
 
-    const char *applicationName = SDL_GetStringProperty(props, SDL_PROP_GPU_DEVICE_CREATE_XR_APPLICATION_NAME_STRING, "SDL Application");
-    Uint32 applicationVersion = (Uint32)SDL_GetNumberProperty(props, SDL_PROP_GPU_DEVICE_CREATE_XR_APPLICATION_VERSION_NUMBER, 0);
+    const Uint32 applicationVersion = (Uint32)SDL_GetNumberProperty(props, SDL_PROP_GPU_DEVICE_CREATE_XR_APPLICATION_VERSION_NUMBER, 0);
+    const char *applicationName = SDL_GetStringProperty(props, SDL_PROP_GPU_DEVICE_CREATE_XR_APPLICATION_NAME_STRING, NULL);
+    if (!applicationName) {
+        applicationName = SDL_GetAppMetadataProperty(SDL_PROP_APP_METADATA_NAME_STRING);
+    }
 
 
     SDL_strlcpy(xrInstanceCreateInfo.applicationInfo.applicationName, applicationName, XR_MAX_APPLICATION_NAME_SIZE);
     SDL_strlcpy(xrInstanceCreateInfo.applicationInfo.applicationName, applicationName, XR_MAX_APPLICATION_NAME_SIZE);
     xrInstanceCreateInfo.applicationInfo.applicationVersion = applicationVersion;
     xrInstanceCreateInfo.applicationInfo.applicationVersion = applicationVersion;