Commit 829042cf authored by Adrien Plazas's avatar Adrien Plazas
Browse files

flatpak: Drop the Citra patches

They have been merged upstream.
parent 467368be
Pipeline #302158 passed with stage
in 33 minutes and 54 seconds
From e93a3b3713e91661a0ac6603586758c63b7005d1 Mon Sep 17 00:00:00 2001
From: Adrien Plazas <kekun.plazas@laposte.net>
Date: Sun, 25 Jul 2021 13:17:33 +0200
Subject: [PATCH 2/2] gsp_gpu: Works around a non-constexpr value
This fixes the compilation as the screen_id function parameter which can
only be 0 or 1 is used where a constant expression is required. It fixes
it by turning this function parameter into a template parameter, which
is a constant expression.
---
src/core/hle/service/gsp/gsp_gpu.cpp | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/core/hle/service/gsp/gsp_gpu.cpp b/src/core/hle/service/gsp/gsp_gpu.cpp
index d9aad5ea5..417f30b47 100644
--- a/src/core/hle/service/gsp/gsp_gpu.cpp
+++ b/src/core/hle/service/gsp/gsp_gpu.cpp
@@ -255,7 +255,12 @@ void GSP_GPU::ReadHWRegs(Kernel::HLERequestContext& ctx) {
rb.PushStaticBuffer(std::move(buffer), 0);
}
-ResultCode SetBufferSwap(u32 screen_id, const FrameBufferInfo& info) {
+ /* This works around a build error where screen_id was a function parameter and
+ * was used where a constant expression was required, which it cannot be.
+ * This relies on the fact that screen_id can only be 0 or 1.
+ */
+template<u32 screen_id>
+ResultCode SetBufferSwapForScreen(const FrameBufferInfo& info) {
u32 base_address = 0x400000;
PAddr phys_address_left = Memory::VirtualToPhysicalAddress(info.address_left);
PAddr phys_address_right = Memory::VirtualToPhysicalAddress(info.address_right);
@@ -295,6 +300,13 @@ ResultCode SetBufferSwap(u32 screen_id, const FrameBufferInfo& info) {
return RESULT_SUCCESS;
}
+ResultCode SetBufferSwap(u32 screen_id, const FrameBufferInfo& info) {
+ if (screen_id == 0)
+ return SetBufferSwapForScreen<0> (info);
+ else
+ return SetBufferSwapForScreen<1> (info);
+}
+
void GSP_GPU::SetBufferSwap(Kernel::HLERequestContext& ctx) {
IPC::RequestParser rp(ctx, 0x5, 8, 0);
u32 screen_id = rp.Pop<u32>();
--
2.31.1
From 6591fa5d00ebb12e70cd4887376ac57eb5c5b53d Mon Sep 17 00:00:00 2001
From: Adrien Plazas <kekun.plazas@laposte.net>
Date: Sun, 25 Jul 2021 12:59:19 +0200
Subject: [PATCH 1/2] ring_buffer: Add a missing include
This fixes compilation errors with modern SDKs.
---
src/common/ring_buffer.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/common/ring_buffer.h b/src/common/ring_buffer.h
index 428d3095f..6f39262b2 100644
--- a/src/common/ring_buffer.h
+++ b/src/common/ring_buffer.h
@@ -9,6 +9,7 @@
#include <atomic>
#include <cstddef>
#include <cstring>
+#include <limits>
#include <type_traits>
#include <vector>
#include "common/common_types.h"
--
2.31.1
......@@ -21,14 +21,6 @@
{
"type": "git",
"url": "https://github.com/libretro/citra.git"
},
{
"type": "patch",
"path": "citra-ring_buffer-Add-a-missing-include.patch"
},
{
"type": "patch",
"path": "citra-gsp_gpu-Works-around-a-non-constexpr-value.patch"
}
],
"modules" : [
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment