forked from eden-emu/eden
Compare commits
4 commits
Author | SHA1 | Date | |
---|---|---|---|
38642befa2 | |||
130e7e773e | |||
c0bbf1e175 | |||
c58af7b556 |
14 changed files with 41 additions and 21 deletions
|
@ -224,7 +224,7 @@ set(YUZU_TZDB_PATH "" CACHE STRING "Path to a pre-downloaded timezone database")
|
||||||
|
|
||||||
cmake_dependent_option(YUZU_USE_FASTER_LD "Check if a faster linker is available" ON "LINUX" OFF)
|
cmake_dependent_option(YUZU_USE_FASTER_LD "Check if a faster linker is available" ON "LINUX" OFF)
|
||||||
|
|
||||||
cmake_dependent_option(YUZU_USE_BUNDLED_MOLTENVK "Download bundled MoltenVK lib" ON "APPLE" OFF)
|
cmake_dependent_option(YUZU_APPLE_USE_BUNDLED_MONTENVK "Download bundled MoltenVK lib" ON "APPLE" OFF)
|
||||||
|
|
||||||
option(YUZU_DISABLE_LLVM "Disable LLVM (useful for CI)" OFF)
|
option(YUZU_DISABLE_LLVM "Disable LLVM (useful for CI)" OFF)
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ Notes:
|
||||||
* Currently, build fails without this
|
* Currently, build fails without this
|
||||||
- `YUZU_USE_FASTER_LD` (ON) Check if a faster linker is available
|
- `YUZU_USE_FASTER_LD` (ON) Check if a faster linker is available
|
||||||
* Only available on UNIX
|
* Only available on UNIX
|
||||||
- `YUZU_USE_BUNDLED_MOLTENVK` (ON, macOS only) Download bundled MoltenVK lib)
|
- `YUZU_APPLE_USE_BUNDLED_MONTENVK` (ON, macOS only) Download bundled MoltenVK lib)
|
||||||
- `YUZU_TZDB_PATH` (string) Path to a pre-downloaded timezone database (useful for nixOS)
|
- `YUZU_TZDB_PATH` (string) Path to a pre-downloaded timezone database (useful for nixOS)
|
||||||
- `ENABLE_OPENSSL` (ON for Linux and *BSD) Enable OpenSSL backend for the ssl service
|
- `ENABLE_OPENSSL` (ON for Linux and *BSD) Enable OpenSSL backend for the ssl service
|
||||||
* Always enabled if the web service is enabled
|
* Always enabled if the web service is enabled
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
#define TITLE_BAR_FORMAT_RUNNING "@TITLE_BAR_FORMAT_RUNNING@"
|
#define TITLE_BAR_FORMAT_RUNNING "@TITLE_BAR_FORMAT_RUNNING@"
|
||||||
#define IS_DEV_BUILD @IS_DEV_BUILD@
|
#define IS_DEV_BUILD @IS_DEV_BUILD@
|
||||||
#define COMPILER_ID "@CXX_COMPILER@"
|
#define COMPILER_ID "@CXX_COMPILER@"
|
||||||
#define BUILD_AUTO_UPDATE_WEBSITE "@BUILD_AUTO_UPDATE_WEBSITE@"
|
#define BUILD_AUTO_UPDATE_WEBISTE "@BUILD_AUTO_UPDATE_WEBISTE@"
|
||||||
#define BUILD_AUTO_UPDATE_API "@BUILD_AUTO_UPDATE_API@"
|
#define BUILD_AUTO_UPDATE_API "@BUILD_AUTO_UPDATE_API@"
|
||||||
#define BUILD_AUTO_UPDATE_REPO "@BUILD_AUTO_UPDATE_REPO@"
|
#define BUILD_AUTO_UPDATE_REPO "@BUILD_AUTO_UPDATE_REPO@"
|
||||||
|
|
||||||
|
@ -37,7 +37,7 @@ constexpr const char g_title_bar_format_running[] = TITLE_BAR_FORMAT_RUNNING;
|
||||||
constexpr const char g_compiler_id[] = COMPILER_ID;
|
constexpr const char g_compiler_id[] = COMPILER_ID;
|
||||||
constexpr const bool g_is_dev_build = IS_DEV_BUILD;
|
constexpr const bool g_is_dev_build = IS_DEV_BUILD;
|
||||||
|
|
||||||
constexpr const char g_build_auto_update_website[] = BUILD_AUTO_UPDATE_WEBSITE;
|
constexpr const char g_build_auto_update_website[] = BUILD_AUTO_UPDATE_WEBISTE;
|
||||||
constexpr const char g_build_auto_update_api[] = BUILD_AUTO_UPDATE_API;
|
constexpr const char g_build_auto_update_api[] = BUILD_AUTO_UPDATE_API;
|
||||||
constexpr const char g_build_auto_update_repo[] = BUILD_AUTO_UPDATE_REPO;
|
constexpr const char g_build_auto_update_repo[] = BUILD_AUTO_UPDATE_REPO;
|
||||||
|
|
||||||
|
|
|
@ -12,9 +12,10 @@
|
||||||
|
|
||||||
namespace Tegra {
|
namespace Tegra {
|
||||||
|
|
||||||
Decoder::Decoder(Host1x::Host1x& host1x_, s32 id_, const Host1x::NvdecCommon::NvdecRegisters& regs_,
|
Decoder::Decoder(Host1x::Host1x& host1x_, s32 id_, u32 syncpoint_,
|
||||||
|
const Host1x::NvdecCommon::NvdecRegisters& regs_,
|
||||||
Host1x::FrameQueue& frame_queue_)
|
Host1x::FrameQueue& frame_queue_)
|
||||||
: host1x(host1x_), memory_manager{host1x.GMMU()}, regs{regs_}, id{id_}, frame_queue{
|
: host1x(host1x_), memory_manager{host1x.GMMU()}, regs{regs_}, syncpoint{syncpoint_},id{id_}, frame_queue{
|
||||||
frame_queue_} {}
|
frame_queue_} {}
|
||||||
|
|
||||||
Decoder::~Decoder() = default;
|
Decoder::~Decoder() = default;
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
|
||||||
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
|
@ -41,7 +44,7 @@ public:
|
||||||
[[nodiscard]] virtual std::string_view GetCurrentCodecName() const = 0;
|
[[nodiscard]] virtual std::string_view GetCurrentCodecName() const = 0;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
explicit Decoder(Host1x::Host1x& host1x, s32 id,
|
explicit Decoder(Host1x::Host1x& host1x, s32 id, u32 syncpoint,
|
||||||
const Host1x::NvdecCommon::NvdecRegisters& regs,
|
const Host1x::NvdecCommon::NvdecRegisters& regs,
|
||||||
Host1x::FrameQueue& frame_queue);
|
Host1x::FrameQueue& frame_queue);
|
||||||
|
|
||||||
|
@ -53,6 +56,7 @@ protected:
|
||||||
Host1x::Host1x& host1x;
|
Host1x::Host1x& host1x;
|
||||||
Tegra::MemoryManager& memory_manager;
|
Tegra::MemoryManager& memory_manager;
|
||||||
const Host1x::NvdecCommon::NvdecRegisters& regs;
|
const Host1x::NvdecCommon::NvdecRegisters& regs;
|
||||||
|
u32 syncpoint;
|
||||||
s32 id;
|
s32 id;
|
||||||
Host1x::FrameQueue& frame_queue;
|
Host1x::FrameQueue& frame_queue;
|
||||||
Host1x::NvdecCommon::VideoCodec codec;
|
Host1x::NvdecCommon::VideoCodec codec;
|
||||||
|
|
|
@ -29,8 +29,9 @@ constexpr std::array<u8, 16> zig_zag_scan{
|
||||||
} // Anonymous namespace
|
} // Anonymous namespace
|
||||||
|
|
||||||
H264::H264(Host1x::Host1x& host1x_, const Host1x::NvdecCommon::NvdecRegisters& regs_, s32 id_,
|
H264::H264(Host1x::Host1x& host1x_, const Host1x::NvdecCommon::NvdecRegisters& regs_, s32 id_,
|
||||||
|
u32 syncpoint_,
|
||||||
Host1x::FrameQueue& frame_queue_)
|
Host1x::FrameQueue& frame_queue_)
|
||||||
: Decoder{host1x_, id_, regs_, frame_queue_} {
|
: Decoder{host1x_, id_, syncpoint_, regs_, frame_queue_} {
|
||||||
codec = Host1x::NvdecCommon::VideoCodec::H264;
|
codec = Host1x::NvdecCommon::VideoCodec::H264;
|
||||||
initialized = decode_api.Initialize(codec);
|
initialized = decode_api.Initialize(codec);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
|
||||||
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
|
@ -242,7 +245,7 @@ ASSERT_POSITION(weight_scale_4x4, 0x1C0);
|
||||||
class H264 final : public Decoder {
|
class H264 final : public Decoder {
|
||||||
public:
|
public:
|
||||||
explicit H264(Host1x::Host1x& host1x, const Host1x::NvdecCommon::NvdecRegisters& regs, s32 id,
|
explicit H264(Host1x::Host1x& host1x, const Host1x::NvdecCommon::NvdecRegisters& regs, s32 id,
|
||||||
Host1x::FrameQueue& frame_queue);
|
u32 syncpoint, Host1x::FrameQueue& frame_queue);
|
||||||
~H264() override;
|
~H264() override;
|
||||||
|
|
||||||
H264(const H264&) = delete;
|
H264(const H264&) = delete;
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
|
||||||
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
|
@ -9,8 +12,8 @@
|
||||||
|
|
||||||
namespace Tegra::Decoders {
|
namespace Tegra::Decoders {
|
||||||
VP8::VP8(Host1x::Host1x& host1x_, const Host1x::NvdecCommon::NvdecRegisters& regs_, s32 id_,
|
VP8::VP8(Host1x::Host1x& host1x_, const Host1x::NvdecCommon::NvdecRegisters& regs_, s32 id_,
|
||||||
Host1x::FrameQueue& frame_queue_)
|
u32 syncpoint_, Host1x::FrameQueue& frame_queue_)
|
||||||
: Decoder{host1x_, id_, regs_, frame_queue_} {
|
: Decoder{host1x_, id_, syncpoint_, regs_, frame_queue_} {
|
||||||
codec = Host1x::NvdecCommon::VideoCodec::VP8;
|
codec = Host1x::NvdecCommon::VideoCodec::VP8;
|
||||||
initialized = decode_api.Initialize(codec);
|
initialized = decode_api.Initialize(codec);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
|
||||||
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
|
@ -29,7 +32,7 @@ enum class Vp8SurfaceIndex : u32 {
|
||||||
class VP8 final : public Decoder {
|
class VP8 final : public Decoder {
|
||||||
public:
|
public:
|
||||||
explicit VP8(Host1x::Host1x& host1x, const Host1x::NvdecCommon::NvdecRegisters& regs, s32 id,
|
explicit VP8(Host1x::Host1x& host1x, const Host1x::NvdecCommon::NvdecRegisters& regs, s32 id,
|
||||||
Host1x::FrameQueue& frame_queue);
|
u32 syncpoint, Host1x::FrameQueue& frame_queue);
|
||||||
~VP8() override;
|
~VP8() override;
|
||||||
|
|
||||||
VP8(const VP8&) = delete;
|
VP8(const VP8&) = delete;
|
||||||
|
|
|
@ -242,8 +242,8 @@ constexpr std::array<u8, 254> map_lut{
|
||||||
} // Anonymous namespace
|
} // Anonymous namespace
|
||||||
|
|
||||||
VP9::VP9(Host1x::Host1x& host1x_, const Host1x::NvdecCommon::NvdecRegisters& regs_, s32 id_,
|
VP9::VP9(Host1x::Host1x& host1x_, const Host1x::NvdecCommon::NvdecRegisters& regs_, s32 id_,
|
||||||
Host1x::FrameQueue& frame_queue_)
|
u32 syncpoint_, Host1x::FrameQueue& frame_queue_)
|
||||||
: Decoder{host1x_, id_, regs_, frame_queue_} {
|
: Decoder{host1x_, id_, syncpoint_, regs_, frame_queue_} {
|
||||||
codec = Host1x::NvdecCommon::VideoCodec::VP9;
|
codec = Host1x::NvdecCommon::VideoCodec::VP9;
|
||||||
initialized = decode_api.Initialize(codec);
|
initialized = decode_api.Initialize(codec);
|
||||||
}
|
}
|
||||||
|
@ -900,6 +900,8 @@ std::span<const u8> VP9::ComposeFrame() {
|
||||||
|
|
||||||
vp9_hidden_frame = WasFrameHidden();
|
vp9_hidden_frame = WasFrameHidden();
|
||||||
|
|
||||||
|
host1x.GetSyncpointManager().IncrementGuest(syncpoint);
|
||||||
|
|
||||||
return GetFrameBytes();
|
return GetFrameBytes();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
|
||||||
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
|
@ -113,8 +116,8 @@ private:
|
||||||
|
|
||||||
class VP9 final : public Decoder {
|
class VP9 final : public Decoder {
|
||||||
public:
|
public:
|
||||||
explicit VP9(Host1x::Host1x& host1x, const Host1x::NvdecCommon::NvdecRegisters& regs, s32 id,
|
VP9(Host1x::Host1x& host1x_, const Host1x::NvdecCommon::NvdecRegisters& regs_, s32 id_,
|
||||||
Host1x::FrameQueue& frame_queue);
|
u32 syncpoint_, Host1x::FrameQueue& frame_queue_);
|
||||||
~VP9() override;
|
~VP9() override;
|
||||||
|
|
||||||
VP9(const VP9&) = delete;
|
VP9(const VP9&) = delete;
|
||||||
|
|
|
@ -48,13 +48,13 @@ void Nvdec::CreateDecoder(NvdecCommon::VideoCodec codec) {
|
||||||
}
|
}
|
||||||
switch (codec) {
|
switch (codec) {
|
||||||
case NvdecCommon::VideoCodec::H264:
|
case NvdecCommon::VideoCodec::H264:
|
||||||
decoder = std::make_unique<Decoders::H264>(host1x, regs, id, frame_queue);
|
decoder = std::make_unique<Decoders::H264>(host1x, regs, id, syncpoint, frame_queue);
|
||||||
break;
|
break;
|
||||||
case NvdecCommon::VideoCodec::VP8:
|
case NvdecCommon::VideoCodec::VP8:
|
||||||
decoder = std::make_unique<Decoders::VP8>(host1x, regs, id, frame_queue);
|
decoder = std::make_unique<Decoders::VP8>(host1x, regs, id, syncpoint, frame_queue);
|
||||||
break;
|
break;
|
||||||
case NvdecCommon::VideoCodec::VP9:
|
case NvdecCommon::VideoCodec::VP9:
|
||||||
decoder = std::make_unique<Decoders::VP9>(host1x, regs, id, frame_queue);
|
decoder = std::make_unique<Decoders::VP9>(host1x, regs, id, syncpoint, frame_queue);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
UNIMPLEMENTED_MSG("Codec {}", decoder->GetCurrentCodecName());
|
UNIMPLEMENTED_MSG("Codec {}", decoder->GetCurrentCodecName());
|
||||||
|
|
|
@ -366,7 +366,7 @@ if (APPLE)
|
||||||
set_target_properties(yuzu PROPERTIES MACOSX_BUNDLE TRUE)
|
set_target_properties(yuzu PROPERTIES MACOSX_BUNDLE TRUE)
|
||||||
set_target_properties(yuzu PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
|
set_target_properties(yuzu PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
|
||||||
|
|
||||||
if (YUZU_USE_BUNDLED_MOLTENVK)
|
if (YUZU_APPLE_USE_BUNDLED_MONTENVK)
|
||||||
set(MOLTENVK_PLATFORM "macOS")
|
set(MOLTENVK_PLATFORM "macOS")
|
||||||
set(MOLTENVK_VERSION "v1.3.0")
|
set(MOLTENVK_VERSION "v1.3.0")
|
||||||
download_moltenvk(${MOLTENVK_PLATFORM} ${MOLTENVK_VERSION})
|
download_moltenvk(${MOLTENVK_PLATFORM} ${MOLTENVK_VERSION})
|
||||||
|
|
|
@ -58,7 +58,7 @@ std::optional<std::string> UpdateChecker::GetResponse(std::string url, std::stri
|
||||||
|
|
||||||
std::optional<std::string> UpdateChecker::GetLatestRelease(bool include_prereleases)
|
std::optional<std::string> UpdateChecker::GetLatestRelease(bool include_prereleases)
|
||||||
{
|
{
|
||||||
const auto update_check_url = std::string{Common::g_build_auto_update_api};
|
constexpr auto update_check_url = std::string{Common::g_build_auto_update_api};
|
||||||
std::string update_check_path = fmt::format("/repos/{}", std::string{Common::g_build_auto_update_repo});
|
std::string update_check_path = fmt::format("/repos/{}", std::string{Common::g_build_auto_update_repo});
|
||||||
try {
|
try {
|
||||||
if (include_prereleases) { // This can return either a prerelease or a stable release,
|
if (include_prereleases) { // This can return either a prerelease or a stable release,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue