diff options
author | Lioncash <mathew1800@gmail.com> | 2020-10-29 06:48:02 +0100 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2020-10-30 00:37:07 +0100 |
commit | 5553bd3ba22f11f4b989d74ac0e3d46f0e7fb22b (patch) | |
tree | 834ac6a85c76f3865b02c5637569b1f5541c1660 /src/core | |
parent | Merge pull request #4856 from bunnei/webservice-socket-error (diff) | |
download | yuzu-5553bd3ba22f11f4b989d74ac0e3d46f0e7fb22b.tar yuzu-5553bd3ba22f11f4b989d74ac0e3d46f0e7fb22b.tar.gz yuzu-5553bd3ba22f11f4b989d74ac0e3d46f0e7fb22b.tar.bz2 yuzu-5553bd3ba22f11f4b989d74ac0e3d46f0e7fb22b.tar.lz yuzu-5553bd3ba22f11f4b989d74ac0e3d46f0e7fb22b.tar.xz yuzu-5553bd3ba22f11f4b989d74ac0e3d46f0e7fb22b.tar.zst yuzu-5553bd3ba22f11f4b989d74ac0e3d46f0e7fb22b.zip |
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/arm/arm_interface.cpp | 12 | ||||
-rw-r--r-- | src/core/hle/service/nvflinger/buffer_queue.cpp | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/core/arm/arm_interface.cpp b/src/core/arm/arm_interface.cpp index d2295ed90..0951e1976 100644 --- a/src/core/arm/arm_interface.cpp +++ b/src/core/arm/arm_interface.cpp @@ -147,10 +147,18 @@ std::vector<ARM_Interface::BacktraceEntry> ARM_Interface::GetBacktraceFromContex auto fp = ctx.cpu_registers[29]; auto lr = ctx.cpu_registers[30]; while (true) { - out.push_back({"", 0, lr, 0}); - if (!fp) { + out.push_back({ + .module = "", + .address = 0, + .original_address = lr, + .offset = 0, + .name = {}, + }); + + if (fp == 0) { break; } + lr = memory.Read64(fp + 8) - 4; fp = memory.Read64(fp); } diff --git a/src/core/hle/service/nvflinger/buffer_queue.cpp b/src/core/hle/service/nvflinger/buffer_queue.cpp index 4f1e210b1..b89a2d41b 100644 --- a/src/core/hle/service/nvflinger/buffer_queue.cpp +++ b/src/core/hle/service/nvflinger/buffer_queue.cpp @@ -29,6 +29,10 @@ void BufferQueue::SetPreallocatedBuffer(u32 slot, const IGBPBuffer& igbp_buffer) .slot = slot, .status = Buffer::Status::Free, .igbp_buffer = igbp_buffer, + .transform = {}, + .crop_rect = {}, + .swap_interval = 0, + .multi_fence = {}, }); buffer_wait_event.writable->Signal(); |