|
|
@@ -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_)
|