summaryrefslogtreecommitdiff
path: root/src/video_core
diff options
context:
space:
mode:
authorGravatar Franco M2023-10-16 03:25:11 -0300
committerGravatar GitHub2023-10-16 03:25:11 -0300
commitb3b458edf929ebcd3a52fd0724250e5f1ab49957 (patch)
treeffc5d0c9bf75a6cfff1c8a47849a3ed6e4177605 /src/video_core
parentLess code, simpler, better. (diff)
parentMerge pull request #11786 from v1993/cuda-on-linux (diff)
downloadyuzu-b3b458edf929ebcd3a52fd0724250e5f1ab49957.tar.gz
yuzu-b3b458edf929ebcd3a52fd0724250e5f1ab49957.tar.xz
yuzu-b3b458edf929ebcd3a52fd0724250e5f1ab49957.zip
Merge branch 'yuzu-emu:master' into new-shortcut
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/host1x/codecs/codec.cpp10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/video_core/host1x/codecs/codec.cpp b/src/video_core/host1x/codecs/codec.cpp
index 8d7da50fc..dbcf508e5 100644
--- a/src/video_core/host1x/codecs/codec.cpp
+++ b/src/video_core/host1x/codecs/codec.cpp
@@ -137,16 +137,6 @@ bool Codec::CreateGpuAvDevice() {
137 break; 137 break;
138 } 138 }
139 if ((config->methods & HW_CONFIG_METHOD) != 0 && config->device_type == type) { 139 if ((config->methods & HW_CONFIG_METHOD) != 0 && config->device_type == type) {
140#if defined(__unix__)
141 // Some linux decoding backends are reported to crash with this config method
142 // TODO(ameerj): Properly support this method
143 if ((config->methods & AV_CODEC_HW_CONFIG_METHOD_HW_FRAMES_CTX) != 0) {
144 // skip zero-copy decoders, we don't currently support them
145 LOG_DEBUG(Service_NVDRV, "Skipping decoder {} with unsupported capability {}.",
146 av_hwdevice_get_type_name(type), config->methods);
147 continue;
148 }
149#endif
150 LOG_INFO(Service_NVDRV, "Using {} GPU decoder", av_hwdevice_get_type_name(type)); 140 LOG_INFO(Service_NVDRV, "Using {} GPU decoder", av_hwdevice_get_type_name(type));
151 av_codec_ctx->pix_fmt = config->pix_fmt; 141 av_codec_ctx->pix_fmt = config->pix_fmt;
152 return true; 142 return true;