Browse Source

Renamed upscaler interface and abstract base class to be more in line with C# naming conventions

master
Nico de Poel 10 months ago
parent
commit
9c65ed0007
  1. 4
      FSR3UnityPlugin.vcxproj
  2. 4
      FSR3UnityPlugin.vcxproj.filters
  3. 4
      src/FSR2Upscaler_DX11.h
  4. 4
      src/FSR3UnityPlugin.cpp
  5. 4
      src/FSR3Upscaler_FFXBase.h
  6. 2
      src/IUpscaler.h
  7. 4
      src/UpscalerBase.h

4
FSR3UnityPlugin.vcxproj

@ -162,8 +162,8 @@
<ClInclude Include="src/FSR3Upscaler_DX12.h" /> <ClInclude Include="src/FSR3Upscaler_DX12.h" />
<ClInclude Include="src/FSR3Upscaler_FFXBase.h" /> <ClInclude Include="src/FSR3Upscaler_FFXBase.h" />
<ClInclude Include="src/FSR3Upscaler_Vulkan.h" /> <ClInclude Include="src/FSR3Upscaler_Vulkan.h" />
<ClInclude Include="src/Upscaler.h" />
<ClInclude Include="src/UpscalerGraphicsDevice.h" />
<ClInclude Include="src\IUpscaler.h" />
<ClInclude Include="src\UpscalerBase.h" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

4
FSR3UnityPlugin.vcxproj.filters

@ -32,7 +32,7 @@
<ClInclude Include="src/FSR3UnityTypes.h"> <ClInclude Include="src/FSR3UnityTypes.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src/UpscalerGraphicsDevice.h">
<ClInclude Include="src\UpscalerBase.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src/FSR3Upscaler_DX12.h"> <ClInclude Include="src/FSR3Upscaler_DX12.h">
@ -47,7 +47,7 @@
<ClInclude Include="src/FSR2Upscaler_DX11.h"> <ClInclude Include="src/FSR2Upscaler_DX11.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src/Upscaler.h">
<ClInclude Include="src\IUpscaler.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>

4
src/FSR2Upscaler_DX11.h

@ -1,5 +1,5 @@
#pragma once #pragma once
#include "UpscalerGraphicsDevice.h"
#include "UpscalerBase.h"
#include "ffx-fsr2-api/ffx_fsr2.h" #include "ffx-fsr2-api/ffx_fsr2.h"
@ -21,7 +21,7 @@ struct FSR2Feature
FSR3TextureTable textureTable; FSR3TextureTable textureTable;
}; };
class FSR2Upscaler_DX11 : public UpscalerGraphicsDevice<FSR2Feature>
class FSR2Upscaler_DX11 : public UpscalerBase<FSR2Feature>
{ {
public: public:
FSR2Upscaler_DX11(IUnityGraphicsD3D11* graphicsDevice) : FSR2Upscaler_DX11(IUnityGraphicsD3D11* graphicsDevice) :

4
src/FSR3UnityPlugin.cpp

@ -1,4 +1,4 @@
#include "Upscaler.h"
#include "IUpscaler.h"
#include "UnityPluginAPI/IUnityInterface.h" #include "UnityPluginAPI/IUnityInterface.h"
#include "UnityPluginAPI/IUnityLog.h" #include "UnityPluginAPI/IUnityLog.h"
@ -20,7 +20,7 @@ static void UNITY_INTERFACE_API OnGraphicsDeviceEvent(UnityGfxDeviceEventType ev
static void UNITY_INTERFACE_API OnRenderEventAndData(int eventID, void* data); static void UNITY_INTERFACE_API OnRenderEventAndData(int eventID, void* data);
static void UNITY_INTERFACE_API OnSetTextureEvent(int eventID, void* data); static void UNITY_INTERFACE_API OnSetTextureEvent(int eventID, void* data);
static Upscaler* s_Upscaler = nullptr;
static IUpscaler* s_Upscaler = nullptr;
// Unity plugin load event // Unity plugin load event
extern "C" void UNITY_INTERFACE_EXPORT UNITY_INTERFACE_API UnityPluginLoad(IUnityInterfaces* unityInterfaces) extern "C" void UNITY_INTERFACE_EXPORT UNITY_INTERFACE_API UnityPluginLoad(IUnityInterfaces* unityInterfaces)

4
src/FSR3Upscaler_FFXBase.h

@ -1,5 +1,5 @@
#pragma once #pragma once
#include "UpscalerGraphicsDevice.h"
#include "UpscalerBase.h"
#include <sstream> #include <sstream>
@ -21,7 +21,7 @@ struct FSR3Feature_FFX
FSR3TextureTable textureTable; FSR3TextureTable textureTable;
}; };
class FSR3Upscaler_FFXBase : public UpscalerGraphicsDevice<FSR3Feature_FFX>
class FSR3Upscaler_FFXBase : public UpscalerBase<FSR3Feature_FFX>
{ {
public: public:
FSR3Upscaler_FFXBase(IUnityLog* log) FSR3Upscaler_FFXBase(IUnityLog* log)

2
src/Upscaler.h → src/IUpscaler.h

@ -4,7 +4,7 @@
#include "UnityPluginAPI/IUnityInterface.h" #include "UnityPluginAPI/IUnityInterface.h"
#include "FSR3UnityTypes.h" #include "FSR3UnityTypes.h"
class Upscaler
class IUpscaler
{ {
public: public:
virtual bool Init() = 0; virtual bool Init() = 0;

4
src/UpscalerGraphicsDevice.h → src/UpscalerBase.h

@ -1,11 +1,11 @@
#pragma once #pragma once
#include "Upscaler.h"
#include "IUpscaler.h"
#include <vector> #include <vector>
#include <queue> #include <queue>
#include <mutex> #include <mutex>
template<typename TFeature> class UpscalerGraphicsDevice: public Upscaler
template<typename TFeature> class UpscalerBase: public IUpscaler
{ {
public: public:
void Shutdown() override void Shutdown() override
Loading…
Cancel
Save