From 4988f10e9c40f81cabf35e9fcb720239f007028d Mon Sep 17 00:00:00 2001 From: Grigoriy Date: Mon, 19 Mar 2018 16:26:07 +0300 Subject: Fixed plugin script warnings, added sdk version 1.195 --- NVIDIAGfeSDK.uplugin | 2 +- README.md | 6 +- Source/NVIDIAGfeSDK/NVIDIAGfeSDK.Build.cs | 2 +- .../bindings/cpp/highlights/highlights_types_cpp.h | 4 +- .../bindings/cpp/highlights/ihighlights_cpp_impl.h | 2 +- .../Include/gfesdk/bindings/cpp/sdk_types_cpp.h | 1 + ThirdParty/NVIDIAGfeSDK/Include/gfesdk/config.h | 6 +- .../Include/gfesdk/gfe3_product_version.h | 8 +-- .../Include/gfesdk/highlights/highlights_types.h | 13 ----- ThirdParty/NVIDIAGfeSDK/Include/gfesdk/ops/iops.h | 49 +++++++++++++++++ .../NVIDIAGfeSDK/Include/gfesdk/ops/ops_types.h | 26 +++++++++ .../NVIDIAGfeSDK/Include/gfesdk/os_defines.h | 5 ++ ThirdParty/NVIDIAGfeSDK/Include/gfesdk/sdk_types.h | 6 +- .../NVIDIAGfeSDK/Include/gfesdk/sdk_types_ipc.h | 61 ++++++++++++++++++--- ThirdParty/NVIDIAGfeSDK/lib/win32/GfeSDK.lib | Bin 6182 -> 6432 bytes ThirdParty/NVIDIAGfeSDK/lib/win64/GfeSDK.lib | Bin 6100 -> 6344 bytes .../assets/18-NVIDIA-HIGHLIGHTS_button_V1.pdf | Bin 0 -> 448475 bytes .../assets/img/NVIDIA_HIGHLIGHTS_Button_Black.eps | Bin 0 -> 2018486 bytes .../assets/img/NVIDIA_HIGHLIGHTS_Button_White.eps | Bin 0 -> 2009098 bytes ThirdParty/NVIDIAGfeSDK/redist/win32/GfeSDK.dll | Bin 2926480 -> 3216512 bytes ThirdParty/NVIDIAGfeSDK/redist/win64/GfeSDK.dll | Bin 3753360 -> 4240000 bytes 21 files changed, 151 insertions(+), 40 deletions(-) create mode 100644 ThirdParty/NVIDIAGfeSDK/Include/gfesdk/ops/iops.h create mode 100644 ThirdParty/NVIDIAGfeSDK/Include/gfesdk/ops/ops_types.h create mode 100644 ThirdParty/NVIDIAGfeSDK/redist/assets/18-NVIDIA-HIGHLIGHTS_button_V1.pdf create mode 100644 ThirdParty/NVIDIAGfeSDK/redist/assets/img/NVIDIA_HIGHLIGHTS_Button_Black.eps create mode 100644 ThirdParty/NVIDIAGfeSDK/redist/assets/img/NVIDIA_HIGHLIGHTS_Button_White.eps diff --git a/NVIDIAGfeSDK.uplugin b/NVIDIAGfeSDK.uplugin index 925e063..c6d54c5 100644 --- a/NVIDIAGfeSDK.uplugin +++ b/NVIDIAGfeSDK.uplugin @@ -2,7 +2,7 @@ "FileVersion": 3, "FriendlyName": "NVIDIA Shadowplay Highlights SDK Plugin", "Version": 1, - "VersionName": "0.3", + "VersionName": "1.0", "CreatedBy": "NVIDIA", "CreatedByURL": "https://developer.nvidia.com/shadowplay-highlights", "DocsURL": "", diff --git a/README.md b/README.md index d3bb64d..7a96234 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # NVIDIA Shadowplay Highlights plugin # -* GFE SDK Version: 1.1.173.5d889305 -* GeForce Experience minimum version: 3.8 -* Plugin version: 0.2 +* GFE SDK Version: 1.1.195 +* GeForce Experience minimum version: 3.13+ +* Plugin version: 1.0 ## About diff --git a/Source/NVIDIAGfeSDK/NVIDIAGfeSDK.Build.cs b/Source/NVIDIAGfeSDK/NVIDIAGfeSDK.Build.cs index 30e3125..e0e5f67 100644 --- a/Source/NVIDIAGfeSDK/NVIDIAGfeSDK.Build.cs +++ b/Source/NVIDIAGfeSDK/NVIDIAGfeSDK.Build.cs @@ -93,7 +93,7 @@ namespace UnrealBuildTool.Rules PublicAdditionalLibraries.Add("GfeSDK.lib"); PublicDelayLoadDLLs.Add("GfeSDK.dll"); - RuntimeDependencies.Add(new RuntimeDependency(DllName)); + RuntimeDependencies.Add(DllName); } return isLibrarySupported; diff --git a/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/bindings/cpp/highlights/highlights_types_cpp.h b/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/bindings/cpp/highlights/highlights_types_cpp.h index 69dbb88..e71a4b9 100644 --- a/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/bindings/cpp/highlights/highlights_types_cpp.h +++ b/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/bindings/cpp/highlights/highlights_types_cpp.h @@ -29,7 +29,7 @@ struct HighlightDefinition NVGSDK_HighlightType highlightTags; NVGSDK_HighlightSignificance significance; TTranslationTable nameLocaleTable; //!< Locale/translation pairs - HighlightDefinition() : highlightTags(static_cast(0)), significance(static_cast(0)), userDefaultInterest(true) {} + HighlightDefinition() : highlightTags(NVGSDK_HIGHLIGHT_TYPE_NONE), significance(NVGSDK_HIGHLIGHT_SIGNIFICANCE_NONE), userDefaultInterest(true) {} }; //! C++ binding for @ref NVGSDK_HighlightConfigParams @@ -75,7 +75,7 @@ struct GroupView std::string groupId; NVGSDK_HighlightType tagsFilter; NVGSDK_HighlightSignificance significanceFilter; - GroupView() : tagsFilter(NVGSDK_HighlightType(0)), significanceFilter(NVGSDK_HighlightSignificance(0)) {} + GroupView() : tagsFilter(NVGSDK_HIGHLIGHT_TYPE_NONE), significanceFilter(NVGSDK_HIGHLIGHT_SIGNIFICANCE_NONE) {} }; //! C++ binding for @ref NVGSDK_SummaryParams diff --git a/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/bindings/cpp/highlights/ihighlights_cpp_impl.h b/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/bindings/cpp/highlights/ihighlights_cpp_impl.h index 6af42c1..b6a0ba2 100644 --- a/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/bindings/cpp/highlights/ihighlights_cpp_impl.h +++ b/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/bindings/cpp/highlights/ihighlights_cpp_impl.h @@ -79,7 +79,7 @@ inline void HighlightsImpl::ConfigureAsync(HighlightConfigParams const& params, it->userDefaultInterest, it->highlightTags, it->significance, - &cLocaleMaps.back()[0], + it->nameLocaleTable.empty() ? nullptr : &cLocaleMaps.back()[0], it->nameLocaleTable.size() }); } diff --git a/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/bindings/cpp/sdk_types_cpp.h b/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/bindings/cpp/sdk_types_cpp.h index fe04f0a..0b8527a 100644 --- a/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/bindings/cpp/sdk_types_cpp.h +++ b/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/bindings/cpp/sdk_types_cpp.h @@ -11,6 +11,7 @@ #define GFESDK_SDK_TYPES_CPP_H // Include these first, so they don't get stuck in the GfeSDK namespace below +#include #include #include diff --git a/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/config.h b/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/config.h index 3ae765a..f5812c4 100644 --- a/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/config.h +++ b/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/config.h @@ -18,8 +18,8 @@ #define NVGSDK_VERSION_MAJOR 1 #define NVGSDK_VERSION_MINOR 1 -#define NVGSDK_BUILD_NUMBER 173 -#define NVGSDK_BUILD_HASH 5d889305 -#define NVGSDK_BUILD_HASH_STR "5d889305" +#define NVGSDK_BUILD_NUMBER 195 +#define NVGSDK_BUILD_HASH b747996a +#define NVGSDK_BUILD_HASH_STR "b747996a" #endif // _NVGSDK_CONFIG_H_ diff --git a/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/gfe3_product_version.h b/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/gfe3_product_version.h index 64a2a63..f110f0d 100644 --- a/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/gfe3_product_version.h +++ b/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/gfe3_product_version.h @@ -10,7 +10,7 @@ // N - Build counter. // #define NVIDIA_GFE3_VERSION_MAJOR 3 -#define NVIDIA_GFE3_VERSION_MINOR 13 +#define NVIDIA_GFE3_VERSION_MINOR 14 #define NVIDIA_GFE3_VERSION_DEV_REBASE 0 #define NVIDIA_GFE3_VERSION_RNEXT_REBASE 0 #define NVIDIA_GFE3_VERSION_BUILD 47 @@ -22,11 +22,11 @@ // // Format: A,B,XY,N -#define NVIDIA_GFE3_VERSION 3,13,0,47 +#define NVIDIA_GFE3_VERSION 3,14,0,47 // Format: A.B.XY.N -#define NVIDIA_GFE3_VERSION_DOT 3.13.0.47 +#define NVIDIA_GFE3_VERSION_DOT 3.14.0.47 // Format: "A.B.XY.N" -#define NVIDIA_GFE3_VERSION_STRING "3.13.0.47" +#define NVIDIA_GFE3_VERSION_STRING "3.14.0.47" // // Some common strings diff --git a/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/highlights/highlights_types.h b/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/highlights/highlights_types.h index 3ae751c..52ffe01 100644 --- a/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/highlights/highlights_types.h +++ b/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/highlights/highlights_types.h @@ -19,19 +19,6 @@ #include #include -/*! Possible significance values */ -typedef enum -{ - NVGSDK_HIGHLIGHT_SIGNIFICANCE_EXTREMELY_BAD = 0x00000001, - NVGSDK_HIGHLIGHT_SIGNIFICANCE_VERY_BAD = 0x00000002, - NVGSDK_HIGHLIGHT_SIGNIFICANCE_BAD = 0x00000004, - NVGSDK_HIGHLIGHT_SIGNIFICANCE_NEUTRAL = 0x00000010, - NVGSDK_HIGHLIGHT_SIGNIFICANCE_GOOD = 0x00000100, - NVGSDK_HIGHLIGHT_SIGNIFICANCE_VERY_GOOD = 0x00000200, - NVGSDK_HIGHLIGHT_SIGNIFICANCE_EXTREMELY_GOOD = 0x00000400, - NVGSDK_HIGHLIGHT_SIGNIFICANCE_MAX = 0x00000800 -} NVGSDK_HighlightSignificance; - /*! Possible highlights that can occur during gameplay */ typedef struct { diff --git a/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/ops/iops.h b/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/ops/iops.h new file mode 100644 index 0000000..97aadcd --- /dev/null +++ b/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/ops/iops.h @@ -0,0 +1,49 @@ +/* Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved. +* +* NVIDIA CORPORATION and its licensors retain all intellectual property +* and proprietary rights in and to this software, related documentation +* and any modifications thereto. Any use, reproduction, disclosure or +* distribution of this software and related documentation without an express +* license agreement from NVIDIA CORPORATION is strictly prohibited. +*/ + +/*! +* \file +* C GfeSDK OPS API +*/ + +#ifndef GFESDK_OPS_H +#define GFESDK_OPS_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +/*! +* Allows games to optimize themselves with GeforceExperience. +* +* \param handle[in] - Valid SDK handle returned by NVGSDK_Create +* \param params[in] - Optimization parameters that help to find correct game. +* \param callback[in] - Callback return function as described by \ref section_async +* \param context[in] - Opaque context pointer as described by \ref section_async +* +* \retval NVGSDK_SUCCESS - Call was successful +* \retval NVGSDK_ERR_INVALID_PARAMETER - Invalid handle or other pointer provided +* \retval NVGSDK_ERR_APPLICATION_LOOKUP_FAILED - Game isn't recognized +* \retval NVGSDK_ERR_APP_NO_OPTIMIZATION - Game is recognized but has no optimizations to apply +* \retval NVGSDK_ERR_APP_SETTINGS_READ - Error during reading game settings. +* \retval NVGSDK_ERR_APP_SETTINGS_WRITE - Error during writing game settings. +*/ + +NVGSDK_EXPORT void NVGSDKApi +NVGSDK_OPS_OptimizeAsync(NVGSDK_HANDLE* handle, NVGSDK_OPS_OptimizeParams const* params, NVGSDK_EmptyCallback callback, void* context); + + +#ifdef __cplusplus +} +#endif + +#endif // GFESDK_OPS_H diff --git a/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/ops/ops_types.h b/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/ops/ops_types.h new file mode 100644 index 0000000..54364aa --- /dev/null +++ b/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/ops/ops_types.h @@ -0,0 +1,26 @@ +/* Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved. +* +* NVIDIA CORPORATION and its licensors retain all intellectual property +* and proprietary rights in and to this software, related documentation +* and any modifications thereto. Any use, reproduction, disclosure or +* distribution of this software and related documentation without an express +* license agreement from NVIDIA CORPORATION is strictly prohibited. +*/ + +/*! +* \file +* OPS types +*/ + +#ifndef OPS_TYPES_H +#define OPS_TYPES_H + + +/* Parameters passed to Optimize call. */ +struct NVGSDK_OPS_OptimizeParams +{ + char const* imageFilePath; //!< Full path to the application image file used for renderning (e.g. "C:\Steam\steamapps\common\GameName\bin\game.exe") + char const* uwpPackageFamilyName; //!< Contains empty string for desktop applications. For UWP applications, contains package family name. (e.g. "Microsoft.MinecraftUWP_8wekyb3d8bbwe") +}; + +#endif // OPS_TYPES_H diff --git a/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/os_defines.h b/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/os_defines.h index 7cf4688..f2eb0ca 100644 --- a/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/os_defines.h +++ b/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/os_defines.h @@ -27,6 +27,11 @@ extern "C" { #error Add the appropriate construct for the platform complier #endif +// Older versions of MSVC don't support inline in C +#if defined(_MSC_VER) && !defined(__cplusplus) +# define inline __inline +#endif + #ifdef __cplusplus }; #endif diff --git a/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/sdk_types.h b/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/sdk_types.h index 5c9fd44..19375c0 100644 --- a/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/sdk_types.h +++ b/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/sdk_types.h @@ -15,12 +15,12 @@ #ifndef GFESDK_SDK_TYPES_H #define GFESDK_SDK_TYPES_H -#include -#include #include #include +#include +#include -size_t const NVGSDK_MAX_LENGTH = 256; +#define NVGSDK_MAX_LENGTH 256 size_t const NVGSDK_MAX_LOCALE = 128; size_t const NVGSDK_MAX_HIGHLIGHT_TABLE = 128; diff --git a/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/sdk_types_ipc.h b/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/sdk_types_ipc.h index 03416c2..3e0e14e 100644 --- a/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/sdk_types_ipc.h +++ b/ThirdParty/NVIDIAGfeSDK/Include/gfesdk/sdk_types_ipc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. +// Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. // // NVIDIA CORPORATION and its licensors retain all intellectual property // and proprietary rights in and to this software, related documentation @@ -9,6 +9,9 @@ #ifndef NVSDKAPI_IPC_H #define NVSDKAPI_IPC_H +#include +#include + #ifdef __cplusplus extern "C" { #endif @@ -58,12 +61,13 @@ typedef enum _NVGSDK_RetCode NVGSDK_SUCCESS_PENDING = 1003, NVGSDK_SUCCESS_USER_NOT_INTERESTED = 1004, NVGSDK_SUCCESS_PERMISSION_GRANTED = 1005, + NVGSDK_SUCCESS_LINKED = 1006, NVGSDK_ERR_GENERIC = -1001, NVGSDK_ERR_GFE_VERSION = -1002, NVGSDK_ERR_SDK_VERSION = -1003, NVGSDK_ERR_NOT_IMPLEMENTED = -1004, - NVGSDK_ERR_INVALID_PARAMETER = -1005, + NVGSDK_ERR_INVALID_PARAMETER = -1005, NVGSDK_ERR_NOT_SET = -1006, NVGSDK_ERR_SHADOWPLAY_IR_DISABLED = -1007, NVGSDK_ERR_SDK_IN_USE = -1008, @@ -85,7 +89,13 @@ typedef enum _NVGSDK_RetCode NVGSDK_ERR_IPC_FAILED = -1024, NVGSDK_ERR_CONNECTION = -1025, NVGSDK_ERR_MODULE_NOT_LOADED = -1026, - NVGSDK_ERR_LIB_CALL_TIMEOUT = -1027 + NVGSDK_ERR_LIB_CALL_TIMEOUT = -1027, + NVGSDK_ERR_APPLICATION_LOOKUP_FAILED = -1028, + NVGSDK_ERR_APPLICATION_NOT_KNOWN = -1029, + NVGSDK_ERR_FEATURE_DISABLED = -1030, + NVGSDK_ERR_APP_NO_OPTIMIZATION = -1031, + NVGSDK_ERR_APP_SETTINGS_READ = -1032, + NVGSDK_ERR_APP_SETTINGS_WRITE = -1033, } NVGSDK_RetCode; // not using macros to avoid polluting namespace of SDK unnecessarily @@ -105,6 +115,10 @@ inline bool NVGSDK_FAILED(NVGSDK_RetCode r) /*! Possible values for highlight types */ typedef enum { + /*! + * No tags are attached to the highlight + */ + NVGSDK_HIGHLIGHT_TYPE_NONE = 0x00000000, /*! * Signifies direct progress towards completing the game. (e.g. completing a level) */ @@ -133,12 +147,30 @@ typedef enum NVGSDK_HIGHLIGHT_TYPE_MAX = 0x00000020 } NVGSDK_HighlightType; +/*! Possible significance values */ +typedef enum +{ + /*! No significance is attached to the highlights */ + NVGSDK_HIGHLIGHT_SIGNIFICANCE_NONE = 0x00000000, + NVGSDK_HIGHLIGHT_SIGNIFICANCE_EXTREMELY_BAD = 0x00000001, + NVGSDK_HIGHLIGHT_SIGNIFICANCE_VERY_BAD = 0x00000002, + NVGSDK_HIGHLIGHT_SIGNIFICANCE_BAD = 0x00000004, + NVGSDK_HIGHLIGHT_SIGNIFICANCE_NEUTRAL = 0x00000010, + NVGSDK_HIGHLIGHT_SIGNIFICANCE_GOOD = 0x00000100, + NVGSDK_HIGHLIGHT_SIGNIFICANCE_VERY_GOOD = 0x00000200, + NVGSDK_HIGHLIGHT_SIGNIFICANCE_EXTREMELY_GOOD = 0x00000400, + + //! Invalid default value + NVGSDK_HIGHLIGHT_SIGNIFICANCE_MAX = 0x00000800 +} NVGSDK_HighlightSignificance; + /*! Functionality supported by the SDK and possibly requiring user permission */ typedef enum { NVGSDK_SCOPE_HIGHLIGHTS = 0, //!< Scope required to access highlights information, open group summary, etc NVGSDK_SCOPE_HIGHLIGHTS_VIDEO = 1, //!< Scope required to save video highlights NVGSDK_SCOPE_HIGHLIGHTS_SCREENSHOT = 2, //!< Scope required to save screenshot highlights + NVGSDK_SCOPE_OPS = 3, //!< Scope required to optimize the game NVGSDK_SCOPE_MAX } NVGSDK_Scope; @@ -174,6 +206,7 @@ inline const char* NVGSDK_RetCodeToString(NVGSDK_RetCode const ret) case NVGSDK_SUCCESS_PENDING: return "NVGSDK_SUCCESS_PENDING"; case NVGSDK_SUCCESS_USER_NOT_INTERESTED: return "NVGSDK_SUCCESS_USER_NOT_INTERESTED"; case NVGSDK_SUCCESS_PERMISSION_GRANTED: return "NVGSDK_SUCCESS_PERMISSION_GRANTED"; + case NVGSDK_SUCCESS_LINKED: return "NVGSDK_SUCCESS_LINKED"; case NVGSDK_ERR_GENERIC: return "NVGSDK_ERR_GENERIC"; case NVGSDK_ERR_GFE_VERSION: return "NVGSDK_ERR_GFE_VERSION"; case NVGSDK_ERR_SDK_VERSION: return "NVGSDK_ERR_SDK_VERSION"; @@ -185,6 +218,7 @@ inline const char* NVGSDK_RetCodeToString(NVGSDK_RetCode const ret) case NVGSDK_ERR_GROUP_NOT_FOUND: return "NVGSDK_ERR_GROUP_NOT_FOUND"; case NVGSDK_ERR_FILE_NOT_FOUND: return "NVGSDK_ERR_FILE_NOT_FOUND"; case NVGSDK_ERR_HIGHLIGHTS_SETUP_FAILED: return "NVGSDK_ERR_HIGHLIGHTS_SETUP_FAILED"; + case NVGSDK_ERR_HIGHLIGHTS_NOT_CONFIGURED: return "NVGSDK_ERR_HIGHLIGHTS_NOT_CONFIGURED"; case NVGSDK_ERR_HIGHLIGHTS_SAVE_FAILED: return "NVGSDK_ERR_HIGHLIGHTS_SAVE_FAILED"; case NVGSDK_ERR_UNEXPECTED_EXCEPTION: return "NVGSDK_ERR_UNEXPECTED_EXCEPTION"; case NVGSDK_ERR_NO_HIGHLIGHTS: return "NVGSDK_ERR_NO_HIGHLIGHTS"; @@ -200,19 +234,28 @@ inline const char* NVGSDK_RetCodeToString(NVGSDK_RetCode const ret) case NVGSDK_ERR_CONNECTION: return "NVGSDK_ERR_CONNECTION"; case NVGSDK_ERR_MODULE_NOT_LOADED: return "NVGSDK_ERR_MODULE_NOT_LOADED"; case NVGSDK_ERR_LIB_CALL_TIMEOUT: return "NVGSDK_ERR_LIB_CALL_TIMEOUT"; + case NVGSDK_ERR_APPLICATION_LOOKUP_FAILED: return "NVGSDK_ERR_APPLICATION_LOOKUP_FAILED"; + case NVGSDK_ERR_APPLICATION_NOT_KNOWN: return "NVGSDK_ERR_APPLICATION_NOT_KNOWN"; + case NVGSDK_ERR_FEATURE_DISABLED: return "NVGSDK_ERR_FEATURE_DISABLED"; + case NVGSDK_ERR_APP_NO_OPTIMIZATION: return "NVGSDK_ERR_APP_NO_OPTIMIZATION"; + case NVGSDK_ERR_APP_SETTINGS_READ: return "NVGSDK_ERR_APP_SETTINGS_READ"; + case NVGSDK_ERR_APP_SETTINGS_WRITE: return "NVGSDK_ERR_APP_SETTINGS_WRITE"; } return "Unknown code"; } // All alphanumeric and the hyphen -char const VALID_GROUPID_CHARS[] = "^[a-zA-Z0-9\\-_ ]+$"; -wchar_t const VALID_GROUPID_WCHARS[] = L"^[a-zA-Z0-9\\-_ ]+$"; +char const VALID_GROUPID_CHARS[] = "^[a-zA-Z0-9\\-\\._ ']+$"; +wchar_t const VALID_GROUPID_WCHARS[] = L"^[a-zA-Z0-9\\-\\._ ']+$"; + +char const VALID_HIGHLIGHT_DEF_ID_CHARS[] = "^[a-zA-Z0-9\\-\\._ ']+$"; +wchar_t const VALID_HIGHLIGHT_DEF_ID_WCHARS[] = L"^[a-zA-Z0-9\\-\\._ ']+$"; -char const VALID_HIGHLIGHT_DEF_ID_CHARS[] = "^[a-zA-Z0-9\\-_ ]+$"; -wchar_t const VALID_HIGHLIGHT_DEF_ID_WCHARS[] = L"^[a-zA-Z0-9\\-_ ]+$"; +char const VALID_GAMENAME_CHARS[] = "^[a-zA-Z0-9\\-\\._ ']+$"; +wchar_t const VALID_GAMENAME_WCHARS[] = L"^[a-zA-Z0-9\\-\\._ ']+$"; -char const VALID_GAMENAME_CHARS[] = "^[a-zA-Z0-9\\-_ ]+$"; -wchar_t const VALID_GAMENAME_WCHARS[] = L"^[a-zA-Z0-9\\-_ ]+$"; +char const VALID_LOCALE_CODE_CHARS[] = "^[a-zA-Z\\-]+$"; +wchar_t const VALID_LOCALE_CODE_WCHARS[] = L"^[a-zA-Z\\-]+$"; size_t const VALID_HIGHLIGHT_SIGNIFICANCE_WIDTH = 0x8FF; size_t const VALID_HIGHLIGHT_TAG_WIDTH = 0x1F; diff --git a/ThirdParty/NVIDIAGfeSDK/lib/win32/GfeSDK.lib b/ThirdParty/NVIDIAGfeSDK/lib/win32/GfeSDK.lib index ed020a1..9ed088f 100644 Binary files a/ThirdParty/NVIDIAGfeSDK/lib/win32/GfeSDK.lib and b/ThirdParty/NVIDIAGfeSDK/lib/win32/GfeSDK.lib differ diff --git a/ThirdParty/NVIDIAGfeSDK/lib/win64/GfeSDK.lib b/ThirdParty/NVIDIAGfeSDK/lib/win64/GfeSDK.lib index 037a08b..beba2a7 100644 Binary files a/ThirdParty/NVIDIAGfeSDK/lib/win64/GfeSDK.lib and b/ThirdParty/NVIDIAGfeSDK/lib/win64/GfeSDK.lib differ diff --git a/ThirdParty/NVIDIAGfeSDK/redist/assets/18-NVIDIA-HIGHLIGHTS_button_V1.pdf b/ThirdParty/NVIDIAGfeSDK/redist/assets/18-NVIDIA-HIGHLIGHTS_button_V1.pdf new file mode 100644 index 0000000..9525041 Binary files /dev/null and b/ThirdParty/NVIDIAGfeSDK/redist/assets/18-NVIDIA-HIGHLIGHTS_button_V1.pdf differ diff --git a/ThirdParty/NVIDIAGfeSDK/redist/assets/img/NVIDIA_HIGHLIGHTS_Button_Black.eps b/ThirdParty/NVIDIAGfeSDK/redist/assets/img/NVIDIA_HIGHLIGHTS_Button_Black.eps new file mode 100644 index 0000000..889475c Binary files /dev/null and b/ThirdParty/NVIDIAGfeSDK/redist/assets/img/NVIDIA_HIGHLIGHTS_Button_Black.eps differ diff --git a/ThirdParty/NVIDIAGfeSDK/redist/assets/img/NVIDIA_HIGHLIGHTS_Button_White.eps b/ThirdParty/NVIDIAGfeSDK/redist/assets/img/NVIDIA_HIGHLIGHTS_Button_White.eps new file mode 100644 index 0000000..6c51fab Binary files /dev/null and b/ThirdParty/NVIDIAGfeSDK/redist/assets/img/NVIDIA_HIGHLIGHTS_Button_White.eps differ diff --git a/ThirdParty/NVIDIAGfeSDK/redist/win32/GfeSDK.dll b/ThirdParty/NVIDIAGfeSDK/redist/win32/GfeSDK.dll index 75d9b1f..b88c433 100644 Binary files a/ThirdParty/NVIDIAGfeSDK/redist/win32/GfeSDK.dll and b/ThirdParty/NVIDIAGfeSDK/redist/win32/GfeSDK.dll differ diff --git a/ThirdParty/NVIDIAGfeSDK/redist/win64/GfeSDK.dll b/ThirdParty/NVIDIAGfeSDK/redist/win64/GfeSDK.dll index ff73301..bb1f409 100644 Binary files a/ThirdParty/NVIDIAGfeSDK/redist/win64/GfeSDK.dll and b/ThirdParty/NVIDIAGfeSDK/redist/win64/GfeSDK.dll differ -- cgit v1.2.3