summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2018-02-14 04:12:46 +0100
committerSubv <subv2112@gmail.com>2018-02-15 04:57:54 +0100
commit8dee5663b3b2ae5dd1b5a4b9eeacf030caa0de9a (patch)
treeccd2b68ceaf5cae472304344cca3ab156a512d14 /src
parentMerge pull request #188 from bunnei/refactor-buffer-descriptor (diff)
downloadyuzu-8dee5663b3b2ae5dd1b5a4b9eeacf030caa0de9a.tar
yuzu-8dee5663b3b2ae5dd1b5a4b9eeacf030caa0de9a.tar.gz
yuzu-8dee5663b3b2ae5dd1b5a4b9eeacf030caa0de9a.tar.bz2
yuzu-8dee5663b3b2ae5dd1b5a4b9eeacf030caa0de9a.tar.lz
yuzu-8dee5663b3b2ae5dd1b5a4b9eeacf030caa0de9a.tar.xz
yuzu-8dee5663b3b2ae5dd1b5a4b9eeacf030caa0de9a.tar.zst
yuzu-8dee5663b3b2ae5dd1b5a4b9eeacf030caa0de9a.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/nvdrv/nvdrv.h7
-rw-r--r--src/core/hle/service/vi/vi.cpp39
2 files changed, 28 insertions, 18 deletions
diff --git a/src/core/hle/service/nvdrv/nvdrv.h b/src/core/hle/service/nvdrv/nvdrv.h
index e44644624..6a55ff96d 100644
--- a/src/core/hle/service/nvdrv/nvdrv.h
+++ b/src/core/hle/service/nvdrv/nvdrv.h
@@ -17,6 +17,13 @@ namespace Devices {
class nvdevice;
}
+struct IoctlFence {
+ u32 id;
+ u32 value;
+};
+
+static_assert(sizeof(IoctlFence) == 8, "IoctlFence has wrong size");
+
class Module final {
public:
Module();
diff --git a/src/core/hle/service/vi/vi.cpp b/src/core/hle/service/vi/vi.cpp
index ff5005f71..9394a06a7 100644
--- a/src/core/hle/service/vi/vi.cpp
+++ b/src/core/hle/service/vi/vi.cpp
@@ -8,6 +8,7 @@
#include "common/scope_exit.h"
#include "core/core_timing.h"
#include "core/hle/ipc_helpers.h"
+#include "core/hle/service/nvdrv/nvdrv.h"
#include "core/hle/service/nvflinger/buffer_queue.h"
#include "core/hle/service/vi/vi.h"
#include "core/hle/service/vi/vi_m.h"
@@ -86,6 +87,15 @@ public:
write_index = Common::AlignUp(write_index, 4);
}
+ template <typename T>
+ void WriteObject(const T& val) {
+ u32_le size = static_cast<u32>(sizeof(val));
+ Write(size);
+ // TODO(Subv): Support file descriptors.
+ Write<u32_le>(0); // Fd count.
+ Write(val);
+ }
+
void Deserialize() {
Header header{};
std::memcpy(&header, buffer.data(), sizeof(Header));
@@ -262,10 +272,11 @@ public:
Data data;
};
-// TODO(bunnei): Remove this. When set to 1, games will think a fence is valid and boot further.
-// This will break libnx and potentially other apps that more stringently check this. This is here
-// purely as a convenience, and should go away once we implement fences.
-static constexpr u32 FENCE_HACK = 0;
+struct BufferProducerFence {
+ u32 is_valid;
+ std::array<Nvidia::IoctlFence, 4> fences;
+};
+static_assert(sizeof(BufferProducerFence) == 36, "BufferProducerFence has wrong size");
class IGBPDequeueBufferResponseParcel : public Parcel {
public:
@@ -274,20 +285,12 @@ public:
protected:
void SerializeData() override {
- // TODO(bunnei): Find out what this all means. Writing anything non-zero here breaks libnx.
- Write<u32>(0);
- Write<u32>(FENCE_HACK);
- Write<u32>(0);
- Write<u32>(0);
- Write<u32>(0);
- Write<u32>(0);
- Write<u32>(0);
- Write<u32>(0);
- Write<u32>(0);
- Write<u32>(0);
- Write<u32>(0);
- Write<u32>(0);
- Write<u32>(0);
+ // TODO(Subv): Find out how this Fence is used.
+ BufferProducerFence fence = {};
+
+ Write(slot);
+ WriteObject(fence);
+ Write<u32_le>(0);
}
u32_le slot;