diff options
| author | Scott Mansell <phiren@gmail.com> | 2017-02-16 18:48:01 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-16 18:48:01 +1300 |
| commit | d8479869dc4973c544e5a55d0789e341587d9971 (patch) | |
| tree | 1a142e0215b0cd9825cc6945efef5bae0fcabf61 /Source/Core/VideoBackends/D3D12/TextureCache.cpp | |
| parent | f80f7b6f9ceba62d26d6d3c9c7e0afa5ac53959a (diff) | |
| parent | 34b0b1b9d643a669ebfd3ac154003e61f693a3d2 (diff) | |
Merge pull request #4914 from Rastaban/master
C++ conformance fixes (MSVC /permissive-)
Diffstat (limited to 'Source/Core/VideoBackends/D3D12/TextureCache.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/D3D12/TextureCache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/VideoBackends/D3D12/TextureCache.cpp b/Source/Core/VideoBackends/D3D12/TextureCache.cpp index 4e297dc7e8..59198dca8d 100644 --- a/Source/Core/VideoBackends/D3D12/TextureCache.cpp +++ b/Source/Core/VideoBackends/D3D12/TextureCache.cpp @@ -499,7 +499,7 @@ void TextureCache::ConvertTexture(TCacheEntryBase* entry, TCacheEntryBase* uncon g_renderer->RestoreAPIState(); } -D3D12_SHADER_BYTECODE GetConvertShader12(std::string& Type) +D3D12_SHADER_BYTECODE GetConvertShader12(const std::string& Type) { std::string shader = "#define DECODE DecodePixel_"; shader.append(Type); |