diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-06-27 09:33:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-27 09:33:58 -0400 |
| commit | 4df04ad48a2b9f04712ad6627e9712f3625253a9 (patch) | |
| tree | f66c02d4380eaf2ce4391741edb6dda5d6b0dcde /src/video_core/command_classes/vic.cpp | |
| parent | 3bc7b0a587b39671797d5581ea9d252d197c4f5a (diff) | |
| parent | 9476309d53b194d6ded5469dda8c3f0808e712ce (diff) | |
Merge pull request #6529 from ReinUsesLisp/reaper-fixups
buffer_cache,texture_cache: Misc fixups from the memory reaper
Diffstat (limited to 'src/video_core/command_classes/vic.cpp')
| -rw-r--r-- | src/video_core/command_classes/vic.cpp | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/src/video_core/command_classes/vic.cpp b/src/video_core/command_classes/vic.cpp index 0a8b82f2b..5faf8c0f1 100644 --- a/src/video_core/command_classes/vic.cpp +++ b/src/video_core/command_classes/vic.cpp @@ -3,7 +3,28 @@ // Refer to the license.txt file included. #include <array> + +extern "C" { +#if defined(__GNUC__) || defined(__clang__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wconversion" +#endif +#ifdef _MSC_VER +#pragma warning(disable : 4244) // conversion from 'type' to 'type', possible loss of data +#pragma warning(push) +#endif +#include <libswscale/swscale.h> +#if defined(__GNUC__) || defined(__clang__) +#pragma GCC diagnostic pop +#endif +#ifdef _MSC_VER +#pragma warning(pop) +#endif +} + #include "common/assert.h" +#include "common/logging/log.h" + #include "video_core/command_classes/nvdec.h" #include "video_core/command_classes/vic.h" #include "video_core/engines/maxwell_3d.h" @@ -11,10 +32,6 @@ #include "video_core/memory_manager.h" #include "video_core/textures/decoders.h" -extern "C" { -#include <libswscale/swscale.h> -} - namespace Tegra { Vic::Vic(GPU& gpu_, std::shared_ptr<Nvdec> nvdec_processor_) |