CCF_100
/
suyu-mirror
mirror of https://git.suyu.dev/suyu/suyu
1
0
Fork 0
Code Issues Releases Wiki Activity

Address PR feedback 

Co-Authored-By: LC <712067+lioncash@users.noreply.github.com>
merge-requests/60/head
ameerj 2020-11-23 18:38:13 +07:00 committed by ameerj
parent 09722cb4a7
commit 3c37d66c28
4 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp
Unescape Escape View File

@ -34,8 +34,7 @@ NvResult nvhost_nvdec::Ioctl1(Ioctl command, const std::vector<u8>& input,
case 0xa: { case 0xa: {
if (command.length == 0x1c) { if (command.length == 0x1c) {
LOG_INFO(Service_NVDRV, "NVDEC video stream ended"); LOG_INFO(Service_NVDRV, "NVDEC video stream ended");
Tegra::ChCommandHeaderList cmdlist(1); Tegra::ChCommandHeaderList cmdlist{{0xDEADB33F}};
cmdlist[0] = Tegra::ChCommandHeader{0xDEADB33F};
system.GPU().PushCommandBuffer(cmdlist); system.GPU().PushCommandBuffer(cmdlist);
} }
return UnmapBuffer(input, output); return UnmapBuffer(input, output);

3
src/core/hle/service/nvdrv/devices/nvhost_vic.cpp
Unescape Escape View File

@ -30,8 +30,7 @@ NvResult nvhost_vic::Ioctl1(Ioctl command, const std::vector<u8>& input, std::ve
return MapBuffer(input, output); return MapBuffer(input, output);
case 0xa: { case 0xa: {
if (command.length == 0x1c) { if (command.length == 0x1c) {
Tegra::ChCommandHeaderList cmdlist(1); Tegra::ChCommandHeaderList cmdlist{{0xDEADB33F}};
cmdlist[0] = Tegra::ChCommandHeader{0xDEADB33F};
system.GPU().PushCommandBuffer(cmdlist); system.GPU().PushCommandBuffer(cmdlist);
} }
return UnmapBuffer(input, output); return UnmapBuffer(input, output);

9
src/video_core/cdma_pusher.cpp
Unescape Escape View File

@ -103,8 +103,8 @@ void CDmaPusher::ExecuteCommand(u32 state_offset, u32 data) {
case ThiMethod::SetMethod1: case ThiMethod::SetMethod1:
LOG_DEBUG(Service_NVDRV, "NVDEC method 0x{:X}", LOG_DEBUG(Service_NVDRV, "NVDEC method 0x{:X}",
static_cast<u32>(nvdec_thi_state.method_0)); static_cast<u32>(nvdec_thi_state.method_0));
nvdec_processor->ProcessMethod( nvdec_processor->ProcessMethod(static_cast<Nvdec::Method>(nvdec_thi_state.method_0),
static_cast<Tegra::Nvdec::Method>(nvdec_thi_state.method_0), data); data);
break; break;
default: default:
break; break;
@ -128,8 +128,7 @@ void CDmaPusher::ExecuteCommand(u32 state_offset, u32 data) {
case ThiMethod::SetMethod1: case ThiMethod::SetMethod1:
LOG_DEBUG(Service_NVDRV, "VIC method 0x{:X}, Args=({})", LOG_DEBUG(Service_NVDRV, "VIC method 0x{:X}, Args=({})",
static_cast<u32>(vic_thi_state.method_0), data); static_cast<u32>(vic_thi_state.method_0), data);
vic_processor->ProcessMethod(static_cast<Tegra::Vic::Method>(vic_thi_state.method_0), vic_processor->ProcessMethod(static_cast<Vic::Method>(vic_thi_state.method_0), data);
data);
break; break;
default: default:
break; break;
@ -138,7 +137,7 @@ void CDmaPusher::ExecuteCommand(u32 state_offset, u32 data) {
case ChClassId::Host1x: case ChClassId::Host1x:
// This device is mainly for syncpoint synchronization // This device is mainly for syncpoint synchronization
LOG_DEBUG(Service_NVDRV, "Host1X Class Method"); LOG_DEBUG(Service_NVDRV, "Host1X Class Method");
host1x_processor->ProcessMethod(static_cast<Tegra::Host1x::Method>(offset), data); host1x_processor->ProcessMethod(static_cast<Host1x::Method>(offset), data);
break; break;
default: default:
UNIMPLEMENTED_MSG("Current class not implemented {:X}", static_cast<u32>(current_class)); UNIMPLEMENTED_MSG("Current class not implemented {:X}", static_cast<u32>(current_class));

4
src/video_core/cdma_pusher.h
Unescape Escape View File

@ -5,9 +5,7 @@
#pragma once #pragma once
#include <memory> #include <memory>
#include <unordered_map>
#include <vector> #include <vector>
#include <queue>
#include "common/bit_field.h" #include "common/bit_field.h"
#include "common/common_types.h" #include "common/common_types.h"
@ -16,9 +14,9 @@
namespace Tegra { namespace Tegra {
class GPU; class GPU;
class Host1x;
class Nvdec; class Nvdec;
class Vic; class Vic;
class Host1x;
enum class ChSubmissionMode : u32 { enum class ChSubmissionMode : u32 {
SetClass = 0, SetClass = 0,