Browse Source

Fixed clashing helper function names in DX11 and DX12, and fixed missing linker symbol in DX11

fsr2
Nico de Poel 1 year ago
parent
commit
686c848760
  1. 16
      FSR2UnityPlugin.cpp
  2. 4
      FSR3UnityPlugin.vcxproj
  3. BIN
      lib/ffx_fsr2_api/ffx_fsr2_api_dx11_x64.lib
  4. BIN
      lib/ffx_fsr2_api/ffx_fsr2_api_dx11_x64d.lib
  5. BIN
      lib/ffx_fsr2_api/ffx_fsr2_api_dx12_x64.lib
  6. BIN
      lib/ffx_fsr2_api/ffx_fsr2_api_dx12_x64d.lib

16
FSR2UnityPlugin.cpp

@ -173,16 +173,16 @@ extern "C" bool UNITY_INTERFACE_EXPORT UNITY_INTERFACE_API AMDUP_InitApi()
{ {
if (s_GraphicsD3D11 != nullptr) if (s_GraphicsD3D11 != nullptr)
{ {
//ID3D11Device* device = s_GraphicsD3D11->GetDevice();
//if (device == nullptr)
// return false;
ID3D11Device* device = s_GraphicsD3D11->GetDevice();
if (device == nullptr)
return false;
//s_Device = ffxGetDeviceDX11(device);
s_Device = ffxGetDeviceDX11(device);
//size_t scratchBufferSize = ffxFsr2GetScratchMemorySizeDX11();
//void* scratchBuffer = malloc(scratchBufferSize);
//ffxFsr2GetInterfaceDX11(&s_Fsr2Interface, device, scratchBuffer, scratchBufferSize);
//return true;
size_t scratchBufferSize = ffxFsr2GetScratchMemorySizeDX11();
void* scratchBuffer = malloc(scratchBufferSize);
ffxFsr2GetInterfaceDX11(&s_Fsr2Interface, device, scratchBuffer, scratchBufferSize);
return true;
} }
else if (s_GraphicsD3D12 != nullptr) else if (s_GraphicsD3D12 != nullptr)
{ {

4
FSR3UnityPlugin.vcxproj

@ -125,7 +125,7 @@
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC> <EnableUAC>false</EnableUAC>
<AdditionalDependencies>$(CoreLibraryDependencies);%(AdditionalDependencies);lib\ffx_fsr2_api\ffx_fsr2_api_x64d.lib;lib\ffx_fsr2_api\ffx_fsr2_api_dx11_x64d.lib;lib\ffx_fsr2_api\ffx_fsr2_api_dx12_x64d.lib;lib\ffx_fsr2_api\ffx_fsr2_api_vk_x64d.lib;vulkan-1.lib</AdditionalDependencies>
<AdditionalDependencies>$(CoreLibraryDependencies);%(AdditionalDependencies);lib\ffx_fsr2_api\ffx_fsr2_api_x64d.lib;lib\ffx_fsr2_api\ffx_fsr2_api_dx11_x64d.lib;lib\ffx_fsr2_api\ffx_fsr2_api_dx12_x64d.lib;lib\ffx_fsr2_api\ffx_fsr2_api_vk_x64d.lib;vulkan-1.lib;dxguid.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>%VULKAN_SDK%\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>%VULKAN_SDK%\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@ -147,7 +147,7 @@
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC> <EnableUAC>false</EnableUAC>
<AdditionalDependencies>$(CoreLibraryDependencies);%(AdditionalDependencies);lib\ffx_fsr2_api\ffx_fsr2_api_x64.lib;lib\ffx_fsr2_api\ffx_fsr2_api_dx11_x64.lib;lib\ffx_fsr2_api\ffx_fsr2_api_dx12_x64.lib;lib\ffx_fsr2_api\ffx_fsr2_api_vk_x64.lib;vulkan-1.lib</AdditionalDependencies>
<AdditionalDependencies>$(CoreLibraryDependencies);%(AdditionalDependencies);lib\ffx_fsr2_api\ffx_fsr2_api_x64.lib;lib\ffx_fsr2_api\ffx_fsr2_api_dx11_x64.lib;lib\ffx_fsr2_api\ffx_fsr2_api_dx12_x64.lib;lib\ffx_fsr2_api\ffx_fsr2_api_vk_x64.lib;vulkan-1.lib;dxguid.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>%VULKAN_SDK%\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>%VULKAN_SDK%\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>

BIN
lib/ffx_fsr2_api/ffx_fsr2_api_dx11_x64.lib

BIN
lib/ffx_fsr2_api/ffx_fsr2_api_dx11_x64d.lib

BIN
lib/ffx_fsr2_api/ffx_fsr2_api_dx12_x64.lib

BIN
lib/ffx_fsr2_api/ffx_fsr2_api_dx12_x64d.lib

Loading…
Cancel
Save