From 2b3decfff3f4a211143043378a019057595a73de Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Tue, 2 Nov 2021 02:07:09 +0100 Subject: [PATCH] early-access version 2176 --- README.md | 2 +- .../hle/service/nvdrv/devices/nvhost_ctrl.cpp | 20 ------------------- .../hle/service/nvdrv/devices/nvhost_ctrl.h | 8 +++----- .../glasm/emit_glasm_not_implemented.cpp | 2 +- 4 files changed, 5 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 8bb8d505e..e09c77981 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 2175. +This is the source code for early-access 2176. ## Legal Notice diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp index 181011283..f9b82b504 100755 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp @@ -2,10 +2,6 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -// SPDX-License-Identifier: MPL-2.0 -// Copyright 2021 Skyline Team and Contributors (https://github.com/skyline-emu/) -// Copyright 2019-2020 Ryujinx Team and Contributors - #include #include @@ -42,8 +38,6 @@ NvResult nvhost_ctrl::Ioctl1(DeviceFD fd, Ioctl command, const std::vector& return IocCtrlEventRegister(input, output); case 0x20: return IocCtrlEventUnregister(input, output); - case 0x21: - return IocCtrlFreeEventBatch(input, output); } break; default: @@ -227,18 +221,4 @@ NvResult nvhost_ctrl::IocCtrlClearEventWait(const std::vector& input, std::v return NvResult::Success; } -NvResult nvhost_ctrl::IocCtrlFreeEventBatch(const std::vector& input, std::vector& output) { - IocCtrlFreeEventBatchParams params{}; - std::memcpy(¶ms, input.data(), sizeof(params)); - - LOG_DEBUG(Service_NVDRV, "called, bit_mask={}", params.bit_mask); - - for (u32 event_id = 0; event_id < MaxNvEvents; ++event_id) { - if (params.bit_mask & (1ULL << event_id)) { - events_interface.UnregisterEvent(event_id); - } - } - - return NvResult::Success; -} } // namespace Service::Nvidia::Devices diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h index 69a1bc93c..cdf03887d 100755 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h @@ -119,18 +119,16 @@ private: static_assert(sizeof(IocCtrlEventUnregisterParams) == 4, "IocCtrlEventUnregisterParams is incorrect size"); - struct IocCtrlFreeEventBatchParams { - u64_le bit_mask{}; + struct IocCtrlEventKill { + u64_le user_events{}; }; - static_assert(sizeof(IocCtrlFreeEventBatchParams) == 8, - "IocCtrlFreeEventBatchParams is incorrect size"); + static_assert(sizeof(IocCtrlEventKill) == 8, "IocCtrlEventKill is incorrect size"); NvResult NvOsGetConfigU32(const std::vector& input, std::vector& output); NvResult IocCtrlEventWait(const std::vector& input, std::vector& output, bool is_async); NvResult IocCtrlEventRegister(const std::vector& input, std::vector& output); NvResult IocCtrlEventUnregister(const std::vector& input, std::vector& output); NvResult IocCtrlClearEventWait(const std::vector& input, std::vector& output); - NvResult IocCtrlFreeEventBatch(const std::vector& input, std::vector& output); EventInterface& events_interface; SyncpointManager& syncpoint_manager; diff --git a/src/shader_recompiler/backend/glasm/emit_glasm_not_implemented.cpp b/src/shader_recompiler/backend/glasm/emit_glasm_not_implemented.cpp index d41b0aac8..681aeda8d 100755 --- a/src/shader_recompiler/backend/glasm/emit_glasm_not_implemented.cpp +++ b/src/shader_recompiler/backend/glasm/emit_glasm_not_implemented.cpp @@ -18,7 +18,7 @@ namespace Shader::Backend::GLASM { #define NotImplemented() throw NotImplementedException("GLASM instruction {}", __LINE__) static void DefinePhi(EmitContext& ctx, IR::Inst& phi) { - switch (phi.Arg(0).Type()) { + switch (phi.Type()) { case IR::Type::U1: case IR::Type::U32: case IR::Type::F32: