mirror of
https://git.eden-emu.dev/eden-emu/eden.git
synced 2026-09-23 18:24:57 +00:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ac86f96efa |
@@ -0,0 +1,34 @@
|
|||||||
|
diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
|
||||||
|
index 2859ee1..766961f 100644
|
||||||
|
--- a/libavutil/hwcontext_vulkan.c
|
||||||
|
+++ b/libavutil/hwcontext_vulkan.c
|
||||||
|
@@ -1688,10 +1688,12 @@ static int setup_queue_families(AVHWDeviceContext *ctx, VkDeviceCreateInfo *cd)
|
||||||
|
|
||||||
|
hwctx->nb_qf = 0;
|
||||||
|
hwctx->queue_flags = 0;
|
||||||
|
+/* SD gamemode vkroots crash
|
||||||
|
#ifdef VK_KHR_internally_synchronized_queues
|
||||||
|
if (p->vkctx.extensions & FF_VK_EXT_INTERNAL_QUEUE_SYNC)
|
||||||
|
hwctx->queue_flags |= VK_DEVICE_QUEUE_CREATE_INTERNALLY_SYNCHRONIZED_BIT_KHR;
|
||||||
|
#endif
|
||||||
|
+*/
|
||||||
|
|
||||||
|
/* Pick each queue family to use. */
|
||||||
|
#define PICK_QF(type, vid_op) \
|
||||||
|
diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c
|
||||||
|
index b2e575c..5b3c9cf 100644
|
||||||
|
--- a/libavutil/vulkan.c
|
||||||
|
+++ b/libavutil/vulkan.c
|
||||||
|
@@ -574,10 +574,12 @@ int ff_vk_exec_pool_init(FFVulkanContext *s, AVVulkanDeviceQueueFamily *qf,
|
||||||
|
e->qf = qf->idx;
|
||||||
|
VkDeviceQueueInfo2 qinfo = {
|
||||||
|
.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_INFO_2,
|
||||||
|
+/* SD gamemode vkroots crash
|
||||||
|
#ifdef VK_KHR_internally_synchronized_queues
|
||||||
|
.flags = internal_queue_sync ?
|
||||||
|
VK_DEVICE_QUEUE_CREATE_INTERNALLY_SYNCHRONIZED_BIT_KHR : 0,
|
||||||
|
#endif
|
||||||
|
+*/
|
||||||
|
.queueFamilyIndex = qf->idx,
|
||||||
|
.queueIndex = e->qi,
|
||||||
|
};
|
||||||
+2
-2
@@ -70,9 +70,9 @@
|
|||||||
"version": "v1.3.18"
|
"version": "v1.3.18"
|
||||||
},
|
},
|
||||||
"ffmpeg": {
|
"ffmpeg": {
|
||||||
"hash": "ed177621176b3961bdcaa339187d3a7688c1c8b060b79c4bb0257cbc67ad7021ae5d5adca5303b45625abbbe3d9aafdd87ce777b8690ac295290d744c875489a",
|
"hash": "68f46abf0d5dc47ab95083d59e273131a8df7948b82e62db00f00fa416e1d0bd24b799671b5a60752209bb2ac0f75295055ed0085c89a98113323cde23b69710",
|
||||||
"repo": "FFmpeg/FFmpeg",
|
"repo": "FFmpeg/FFmpeg",
|
||||||
"version": "c7b5f1537d"
|
"version": "6efe500d2e"
|
||||||
},
|
},
|
||||||
"ffmpeg-ci": {
|
"ffmpeg-ci": {
|
||||||
"ci": true,
|
"ci": true,
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ add_library(
|
|||||||
cityhash.h
|
cityhash.h
|
||||||
common_funcs.h
|
common_funcs.h
|
||||||
common_types.h
|
common_types.h
|
||||||
|
concepts.h
|
||||||
container_hash.h
|
container_hash.h
|
||||||
demangle.cpp
|
demangle.cpp
|
||||||
demangle.h
|
demangle.h
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
|
||||||
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
|
// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
|
||||||
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <iterator>
|
||||||
|
#include <type_traits>
|
||||||
|
|
||||||
|
namespace Common {
|
||||||
|
|
||||||
|
// Check if type satisfies the ContiguousContainer named requirement.
|
||||||
|
template <typename T>
|
||||||
|
concept IsContiguousContainer = std::contiguous_iterator<typename T::iterator>;
|
||||||
|
|
||||||
|
} // namespace Common
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
|
||||||
// SPDX-License-Identifier: GPL-3.0-or-later
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
// SPDX-FileCopyrightText: 2015 Evan Teran
|
// SPDX-FileCopyrightText: 2015 Evan Teran
|
||||||
@@ -15,6 +15,8 @@
|
|||||||
#include <ostream>
|
#include <ostream>
|
||||||
#include <type_traits>
|
#include <type_traits>
|
||||||
|
|
||||||
|
#include <common/concepts.h>
|
||||||
|
|
||||||
namespace Common {
|
namespace Common {
|
||||||
|
|
||||||
// No equivalent for "std::arithmetic" in the stdlib
|
// No equivalent for "std::arithmetic" in the stdlib
|
||||||
|
|||||||
@@ -6,12 +6,12 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <concepts>
|
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
#include <filesystem>
|
#include <filesystem>
|
||||||
#include <span>
|
#include <span>
|
||||||
#include <type_traits>
|
#include <type_traits>
|
||||||
|
|
||||||
|
#include "common/concepts.h"
|
||||||
#include "common/fs/fs_types.h"
|
#include "common/fs/fs_types.h"
|
||||||
#include "common/fs/fs_util.h"
|
#include "common/fs/fs_util.h"
|
||||||
|
|
||||||
@@ -212,7 +212,7 @@ public:
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Helper function which deduces the value type of a contiguous STL container used in ReadSpan.
|
* Helper function which deduces the value type of a contiguous STL container used in ReadSpan.
|
||||||
* If T is not a contiguous container as defined by the concept, this
|
* If T is not a contiguous container as defined by the concept IsContiguousContainer, this
|
||||||
* calls ReadObject and T must be a trivially copyable object.
|
* calls ReadObject and T must be a trivially copyable object.
|
||||||
*
|
*
|
||||||
* See ReadSpan for more details if T is a contiguous container.
|
* See ReadSpan for more details if T is a contiguous container.
|
||||||
@@ -226,7 +226,7 @@ public:
|
|||||||
*/
|
*/
|
||||||
template <typename T>
|
template <typename T>
|
||||||
[[nodiscard]] size_t Read(T& data) const {
|
[[nodiscard]] size_t Read(T& data) const {
|
||||||
if constexpr (std::contiguous_iterator<typename T::iterator>) {
|
if constexpr (IsContiguousContainer<T>) {
|
||||||
using ContiguousType = typename T::value_type;
|
using ContiguousType = typename T::value_type;
|
||||||
static_assert(std::is_trivially_copyable_v<ContiguousType>,
|
static_assert(std::is_trivially_copyable_v<ContiguousType>,
|
||||||
"Data type must be trivially copyable.");
|
"Data type must be trivially copyable.");
|
||||||
@@ -238,7 +238,7 @@ public:
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Helper function which deduces the value type of a contiguous STL container used in WriteSpan.
|
* Helper function which deduces the value type of a contiguous STL container used in WriteSpan.
|
||||||
* If T is not a contiguous STL container as defined by the concept, this
|
* If T is not a contiguous STL container as defined by the concept IsContiguousContainer, this
|
||||||
* calls WriteObject and T must be a trivially copyable object.
|
* calls WriteObject and T must be a trivially copyable object.
|
||||||
*
|
*
|
||||||
* See WriteSpan for more details if T is a contiguous container.
|
* See WriteSpan for more details if T is a contiguous container.
|
||||||
@@ -252,7 +252,7 @@ public:
|
|||||||
*/
|
*/
|
||||||
template <typename T>
|
template <typename T>
|
||||||
[[nodiscard]] size_t Write(const T& data) const {
|
[[nodiscard]] size_t Write(const T& data) const {
|
||||||
if constexpr (std::contiguous_iterator<typename T::iterator>) {
|
if constexpr (IsContiguousContainer<T>) {
|
||||||
using ContiguousType = typename T::value_type;
|
using ContiguousType = typename T::value_type;
|
||||||
static_assert(std::is_trivially_copyable_v<ContiguousType>,
|
static_assert(std::is_trivially_copyable_v<ContiguousType>,
|
||||||
"Data type must be trivially copyable.");
|
"Data type must be trivially copyable.");
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <concepts>
|
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
@@ -19,6 +18,7 @@
|
|||||||
|
|
||||||
#include "common/assert.h"
|
#include "common/assert.h"
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
|
#include "common/concepts.h"
|
||||||
#include "common/swap.h"
|
#include "common/swap.h"
|
||||||
#include "core/hle/ipc.h"
|
#include "core/hle/ipc.h"
|
||||||
#include "core/hle/kernel/k_handle_table.h"
|
#include "core/hle/kernel/k_handle_table.h"
|
||||||
@@ -292,20 +292,18 @@ public:
|
|||||||
* @param data The container/data to write into a buffer.
|
* @param data The container/data to write into a buffer.
|
||||||
* @param buffer_index The buffer in particular to write to.
|
* @param buffer_index The buffer in particular to write to.
|
||||||
*/
|
*/
|
||||||
template <typename T>
|
template <typename T, typename = std::enable_if_t<!std::is_pointer_v<T>>>
|
||||||
requires (!std::is_pointer_v<T>
|
|
||||||
&& std::contiguous_iterator<typename T::iterator>)
|
|
||||||
std::size_t WriteBuffer(const T& data, std::size_t buffer_index = 0) const {
|
std::size_t WriteBuffer(const T& data, std::size_t buffer_index = 0) const {
|
||||||
using C = typename T::value_type;
|
if constexpr (Common::IsContiguousContainer<T>) {
|
||||||
static_assert(std::is_trivially_copyable_v<C>, "Container to WriteBuffer must contain trivially copyable objects");
|
using ContiguousType = typename T::value_type;
|
||||||
return WriteBuffer(std::data(data), std::size(data) * sizeof(C), buffer_index);
|
static_assert(std::is_trivially_copyable_v<ContiguousType>,
|
||||||
}
|
"Container to WriteBuffer must contain trivially copyable objects");
|
||||||
template <typename T>
|
return WriteBuffer(std::data(data), std::size(data) * sizeof(ContiguousType),
|
||||||
requires (!std::is_pointer_v<T>
|
buffer_index);
|
||||||
&& !std::contiguous_iterator<typename T::iterator>)
|
} else {
|
||||||
std::size_t WriteBuffer(const T& data, std::size_t buffer_index = 0) const {
|
static_assert(std::is_trivially_copyable_v<T>, "T must be trivially copyable");
|
||||||
static_assert(std::is_trivially_copyable_v<T>, "T must be trivially copyable");
|
return WriteBuffer(&data, sizeof(T), buffer_index);
|
||||||
return WriteBuffer(&data, sizeof(T), buffer_index);
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Helper function to get the size of the input buffer
|
/// Helper function to get the size of the input buffer
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
|
||||||
// SPDX-License-Identifier: GPL-3.0-or-later
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
||||||
@@ -9,6 +9,7 @@
|
|||||||
#include <span>
|
#include <span>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
#include "common/concepts.h"
|
||||||
#include "core/hle/service/nvdrv/devices/nvdevice.h"
|
#include "core/hle/service/nvdrv/devices/nvdevice.h"
|
||||||
|
|
||||||
namespace Service::Nvidia::Devices {
|
namespace Service::Nvidia::Devices {
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <concepts>
|
#include <concepts>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
#include "common/concepts.h"
|
||||||
#include "common/fs/path_util.h"
|
#include "common/fs/path_util.h"
|
||||||
#include "common/logging.h"
|
#include "common/logging.h"
|
||||||
#include "common/string_util.h"
|
#include "common/string_util.h"
|
||||||
|
|||||||
Reference in New Issue
Block a user