summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2018-01-11 22:31:12 -0500
committerGravatar bunnei2018-01-11 22:31:12 -0500
commit94ad97def028f037f31282f825dd508332d93b26 (patch)
treee0e72224f063c6f3d3cd4abd0abe3611a455df1c
parentnvdisp_disp0: Fix broken assert. (diff)
downloadyuzu-94ad97def028f037f31282f825dd508332d93b26.tar.gz
yuzu-94ad97def028f037f31282f825dd508332d93b26.tar.xz
yuzu-94ad97def028f037f31282f825dd508332d93b26.zip
nv: Fix more broken asserts.
-rw-r--r--src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp2
-rw-r--r--src/core/hle/service/nvdrv/devices/nvmap.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp
index 50fee8f46..b36a5aadc 100644
--- a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp
@@ -11,7 +11,7 @@ namespace NVDRV {
11namespace Devices { 11namespace Devices {
12 12
13u32 nvhost_as_gpu::ioctl(u32 command, const std::vector<u8>& input, std::vector<u8>& output) { 13u32 nvhost_as_gpu::ioctl(u32 command, const std::vector<u8>& input, std::vector<u8>& output) {
14 ASSERT(false, "Unimplemented"); 14 UNIMPLEMENTED();
15 return 0; 15 return 0;
16} 16}
17 17
diff --git a/src/core/hle/service/nvdrv/devices/nvmap.cpp b/src/core/hle/service/nvdrv/devices/nvmap.cpp
index fdf2f7be5..4d6b9cfce 100644
--- a/src/core/hle/service/nvdrv/devices/nvmap.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvmap.cpp
@@ -33,7 +33,7 @@ u32 nvmap::ioctl(u32 command, const std::vector<u8>& input, std::vector<u8>& out
33 return IocParam(input, output); 33 return IocParam(input, output);
34 } 34 }
35 35
36 ASSERT(false, "Unimplemented"); 36 UNIMPLEMENTED();
37} 37}
38 38
39u32 nvmap::IocCreate(const std::vector<u8>& input, std::vector<u8>& output) { 39u32 nvmap::IocCreate(const std::vector<u8>& input, std::vector<u8>& output) {
@@ -141,7 +141,7 @@ u32 nvmap::IocParam(const std::vector<u8>& input, std::vector<u8>& output) {
141 params.value = object->kind; 141 params.value = object->kind;
142 break; 142 break;
143 default: 143 default:
144 ASSERT(false, "Unimplemented"); 144 UNIMPLEMENTED();
145 } 145 }
146 146
147 std::memcpy(output.data(), &params, sizeof(params)); 147 std::memcpy(output.data(), &params, sizeof(params));