diff options
| author | Franco M <francomaro@gmail.com> | 2023-10-16 03:25:11 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-16 03:25:11 -0300 |
| commit | d420d11496cd5d71c7f4e4fa7b0eaf9c2f13dc80 (patch) | |
| tree | ffc5d0c9bf75a6cfff1c8a47849a3ed6e4177605 /src | |
| parent | a71d026df6d76e0d103453ff4bccd347d14494cf (diff) | |
| parent | c4e1a9a7a69d910f9a846329e6e04327009ae0a6 (diff) | |
Merge branch 'yuzu-emu:master' into new-shortcut
Diffstat (limited to 'src')
| -rw-r--r-- | src/input_common/drivers/udp_client.cpp | 1 | ||||
| -rw-r--r-- | src/video_core/host1x/codecs/codec.cpp | 10 |
2 files changed, 1 insertions, 10 deletions
diff --git a/src/input_common/drivers/udp_client.cpp b/src/input_common/drivers/udp_client.cpp index 808b21069f..77db60e929 100644 --- a/src/input_common/drivers/udp_client.cpp +++ b/src/input_common/drivers/udp_client.cpp @@ -338,6 +338,7 @@ void UDPClient::StartCommunication(std::size_t client, const std::string& host, for (std::size_t index = 0; index < PADS_PER_CLIENT; ++index) { const PadIdentifier identifier = GetPadIdentifier(client * PADS_PER_CLIENT + index); PreSetController(identifier); + PreSetMotion(identifier, 0); } } diff --git a/src/video_core/host1x/codecs/codec.cpp b/src/video_core/host1x/codecs/codec.cpp index 8d7da50fc0..dbcf508e56 100644 --- a/src/video_core/host1x/codecs/codec.cpp +++ b/src/video_core/host1x/codecs/codec.cpp @@ -137,16 +137,6 @@ bool Codec::CreateGpuAvDevice() { break; } if ((config->methods & HW_CONFIG_METHOD) != 0 && config->device_type == type) { -#if defined(__unix__) - // Some linux decoding backends are reported to crash with this config method - // TODO(ameerj): Properly support this method - if ((config->methods & AV_CODEC_HW_CONFIG_METHOD_HW_FRAMES_CTX) != 0) { - // skip zero-copy decoders, we don't currently support them - LOG_DEBUG(Service_NVDRV, "Skipping decoder {} with unsupported capability {}.", - av_hwdevice_get_type_name(type), config->methods); - continue; - } -#endif LOG_INFO(Service_NVDRV, "Using {} GPU decoder", av_hwdevice_get_type_name(type)); av_codec_ctx->pix_fmt = config->pix_fmt; return true; |
