mrq/FidelityFX-FSR2
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add const to wchar_t* name parameter of ffxGetResourceDX12

Browse Source 
Recent toolsets/compilers will complain if passing a string literal as a
`wchar_t*` as opposed to a `const wchar_t*`. As the inner function makes
no modifications to `name`, there are no functional changes. The
specific v143 VS 2022 compiler error is C2664:

```
Error   C2664   'FfxResource ffxGetResourceDX12(FfxFsr2Context *,ID3D12Resource *,wchar_t *,FfxResourceStates,UINT)': cannot convert argument 3 from 'const wchar_t [17]' to 'wchar_t *'
```
This commit is contained in:
Jeremy Ong 2022-08-02 19:26:40 -06:00
parent 2e6d42ad0a
commit 84ae166b8a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ffx-fsr2-api/dx12/ffx_fsr2_dx12.cpp
View File

@ -323,7 +323,7 @@ FfxSurfaceFormat ffxGetSurfaceFormatDX12(DXGI_FORMAT format)
} }
// register a DX12 resource to the backend // register a DX12 resource to the backend
FfxResource ffxGetResourceDX12(FfxFsr2Context* context, ID3D12Resource* dx12Resource, wchar_t* name, FfxResourceStates state, UINT shaderComponentMapping) FfxResource ffxGetResourceDX12(FfxFsr2Context* context, ID3D12Resource* dx12Resource, const wchar_t* name, FfxResourceStates state, UINT shaderComponentMapping)
{ {
FfxResource resource = {}; FfxResource resource = {};
resource.resource = reinterpret_cast<void*>(dx12Resource); resource.resource = reinterpret_cast<void*>(dx12Resource);

2
src/ffx-fsr2-api/dx12/ffx_fsr2_dx12.h
View File

@ -93,7 +93,7 @@ FFX_API FfxCommandList ffxGetCommandListDX12(ID3D12CommandList* cmdList);
FFX_API FfxResource ffxGetResourceDX12( FFX_API FfxResource ffxGetResourceDX12(
FfxFsr2Context* context, FfxFsr2Context* context,
ID3D12Resource* resDx12, ID3D12Resource* resDx12,
wchar_t* name = nullptr, const wchar_t* name = nullptr,
FfxResourceStates state = FFX_RESOURCE_STATE_COMPUTE_READ, FfxResourceStates state = FFX_RESOURCE_STATE_COMPUTE_READ,
UINT shaderComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING); UINT shaderComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING);