Upscaler branch

.github/workflows/dev-release.yml

@@ -111,5 +111,4 @@ jobs:
           artifacts: ${{github.workspace}}/artifacts/**/*.zip
           makeLatest: true
           bodyFile: ${{github.workspace}}/nightly-body.md
-          allowUpdates: true
-
+          allowUpdates: true

cmake.toml

@@ -97,6 +97,15 @@ tag = "2a706fd2ba355808cada31ac1eed8ce28caa6b37"
 git = "https://github.com/KhronosGroup/OpenXR-SDK"
 tag = "458984d7f59d1ae6dc1b597d94b02e4f7132eaba"
 
+[target.pdperfmod]
+type = "shared"
+include-directories = ["dependencies/pd-perfmod/include"]
+sources = ["dependencies/pd-perfmod/dummy/**.cpp"]
+condition = "build-framework-dependencies"
+
+[target.pdperfmod.properties]
+OUTPUT_NAME = "PDPerfPlugin"
+
 [fetch-content.directxtk]
 git = "https://github.com/microsoft/DirectXTK"
 tag = "f5026eb34e7053b1aff325d38db107703f394974"
@@ -271,7 +280,8 @@ link-libraries = [
     "openxr_loader",
     "delayimp",
     "DirectXTK",
-    "DirectXTK12"
+    "DirectXTK12",
+    "pdperfmod"
 ]
 cmake-before="""
 """
@@ -285,7 +295,7 @@ add_custom_command(
 
 [template.game.properties]
 OUTPUT_NAME = "dinput8"
-LINK_FLAGS = "/DELAYLOAD:openvr_api.dll /DELAYLOAD:openxr_loader.dll /DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:D3DCOMPILER_47.dll"
+LINK_FLAGS = "/DELAYLOAD:openvr_api.dll /DELAYLOAD:openxr_loader.dll /DELAYLOAD:PDPerfPlugin.dll /DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:D3DCOMPILER_47.dll"
 RUNTIME_OUTPUT_DIRECTORY_RELEASE = "${CMAKE_BINARY_DIR}/bin/${CMKR_TARGET}"
 RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO = "${CMAKE_BINARY_DIR}/bin/${CMKR_TARGET}"
 LIBRARY_OUTPUT_DIRECTORY_RELEASE = "${CMAKE_BINARY_DIR}/lib/${CMKR_TARGET}"

dependencies/pd-perfmod/dummy/PDPerfPlugin.cpp

@@ -0,0 +1,44 @@
+// dummy implementation of the DLL so I don't need to commit the DLL to the repo
+#include "../include/PDPerfPlugin.h"
+
+bool __stdcall SetupDirectX(void* item, int graphicsAPI){return false;};
+
+bool __stdcall SetupGraphicDevice(void* tex, int graphicsAPI){return false;};
+
+void* __stdcall InitUpscaler(InitParams* params) {return nullptr;};
+
+void __stdcall EvaluateUpscaler(UpscaleParams* params) {};
+
+void __stdcall SimpleEvaluate(int id, void* color, void* motionVector, void* depth, void* mask, void* destination, int renderSizeX, int renderSizeY, float sharpness,
+float jitterOffsetX, float jitterOffsetY, int motionScaleX, int motionScaleY, bool reset, float nearPlane, float farPlane, float verticalFOV, bool execute) {};
+
+void* __stdcall SimpleInit(int id, int upscaleMethod, int qualityLevel, int displaySizeX, int displaySizeY, bool isContentHDR, bool depthInverted, bool YAxisInverted,
+	bool motionVetorsJittered, bool enableSharpening, bool enableAutoExposure, int format) { return nullptr; };
+
+void __stdcall SetMotionScaleX(int id, float motionScaleX) {};
+
+void __stdcall SetMotionScaleY(int id, float motionScaleX) {};
+
+int __stdcall GetRenderWidth(int id) { return 0; };
+
+int __stdcall GetRenderHeight(int id) { return 0; };
+
+float __stdcall GetOptimalSharpness(int id) { return 0.0f; };
+
+float __stdcall GetOptimalMipmapBias(int id) { return 0.0f;};
+
+void __stdcall SetDebug(bool debug) {};
+
+void __stdcall ReleaseUpscaleFeature(int id) {};
+
+int __stdcall GetJitterPhaseCount(int id) { return 0; };
+
+int __stdcall GetJitterOffset(float* outX, float* outY, int index, int phaseCount) { return 0; };
+
+void __stdcall InitLogDelegate(void (*Log)(char* message, int iSize)) {};
+
+bool __stdcall IsUpscaleMethodAvailable(int upscaleMethod) {
+    return false;
+};
+
+char* __stdcall GetUpscaleMethodName(int upscaleMethod) { return (char*)""; };

dependencies/pd-perfmod/include/PDPerfPlugin.h

@@ -0,0 +1,113 @@
+#pragma once
+
+/* For reference
+* I can't use enum as parameter type cuz unity does't work well
+* No VULKAN yet
+enum GraphicsAPI
+{
+	D3D11,
+	D3D12
+};
+enum UpscaleType
+{
+	DLSS,
+	FSR2,
+	XESS
+};
+enum PerfQualityLevel
+{
+	Performance,
+	Balanced,
+	Quality,
+	UltraPerformance // or UltraQuality for XeSS, I don't know why Intel has to be different
+};
+*/
+
+typedef struct
+{
+	unsigned int X;
+	unsigned int Y;
+} Coordinates;
+
+typedef struct
+{
+	int  id;
+	int  upscaleMethod;
+	int  qualityLevel;
+	int  displaySizeX;
+	int  displaySizeY;
+	int  format;
+	bool isContentHDR;
+	bool depthInverted;
+	bool YAxisInverted;
+	bool motionVetorsJittered;
+	bool enableSharpening;
+	bool enableAutoExposure;
+} InitParams;
+
+struct UpscaleParams
+{
+	int         id;
+	void*       color;
+	void*       motionVector;
+	void*       depth;
+	void*       mask;
+	void*       resolvedColor = nullptr;  // Do not use
+	void*       destination;
+	float       renderSizeX;
+	float       renderSizeY;
+	float       sharpness;
+	float       jitterOffsetX;
+	float       jitterOffsetY;
+	float       motionScaleX;
+	float       motionScaleY;
+	bool        reset;
+	float       nearPlane;
+	float       farPlane;
+	float       verticalFOV;
+	bool        execute;
+	void*       cmdList = nullptr;  // Don not use
+	Coordinates colorBase = { 0, 0 };
+	Coordinates depthBase = { 0, 0 };
+	Coordinates motionBase = { 0, 0 };
+};
+
+/* If you are calling EvaluateUpscale more than once per frame, set execute to true only at last call*/
+
+extern "C" __declspec(dllexport) bool __stdcall SetupDirectX(void* item, int graphicsAPI);
+
+extern "C" __declspec(dllexport) void* __stdcall SimpleInit(int id, int upscaleMethod, int qualityLevel, int displaySizeX, int displaySizeY, bool isContentHDR, bool depthInverted, bool YAxisInverted,
+	bool motionVetorsJittered, bool enableSharpening, bool enableAutoExposure, int format = 10);
+
+extern "C" __declspec(dllexport) void* __stdcall InitUpscaler(InitParams* params);
+
+extern "C" __declspec(dllexport) void __stdcall SimpleEvaluate(int id, void* color, void* motionVector, void* depth, void* mask, void* destination, int renderSizeX, int renderSizeY, float sharpness,
+	float jitterOffsetX, float jitterOffsetY, int motionScaleX, int motionScaleY, bool reset, float nearPlane, float farPlane, float verticalFOV, bool execute = true);
+
+extern "C" __declspec(dllexport) void __stdcall EvaluateUpscaler(UpscaleParams* params);
+
+extern "C" __declspec(dllexport) void __stdcall SetMotionScaleX(int id, float motionScaleX);
+
+extern "C" __declspec(dllexport) void __stdcall SetMotionScaleY(int id, float motionScaleX);
+
+extern "C" __declspec(dllexport) int __stdcall GetRenderWidth(int id);
+
+extern "C" __declspec(dllexport) int __stdcall GetRenderHeight(int id);
+
+extern "C" __declspec(dllexport) float __stdcall GetOptimalSharpness(int id);
+
+extern "C" __declspec(dllexport) float __stdcall GetOptimalMipmapBias(int id);
+
+extern "C" __declspec(dllexport) void __stdcall SetDebug(bool debug = true);
+
+extern "C" __declspec(dllexport) void __stdcall ReleaseUpscaleFeature(int id);
+
+extern "C" __declspec(dllexport) int __stdcall GetJitterPhaseCount(int id);
+
+extern "C" __declspec(dllexport) int __stdcall GetJitterOffset(float* outX, float* outY, int index, int phaseCount);
+
+extern "C" __declspec(dllexport) void __stdcall InitLogDelegate(void (*Log)(char* message, int iSize));
+
+extern "C" __declspec(dllexport) bool __stdcall IsUpscaleMethodAvailable(int upscaleMethod);
+
+extern "C" __declspec(dllexport) char* __stdcall GetUpscaleMethodName(int upscaleMethod);