Merge pull request #8439 from liamwhite/monkey-compiler

general: fix compilation on GCC 12
This commit is contained in:
Mai 2022-06-14 08:34:16 -04:00 committed by GitHub
commit a3b12e3809
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
80 changed files with 221 additions and 213 deletions

View file

@ -40,6 +40,11 @@ target_include_directories(mbedtls PUBLIC ./mbedtls/include)
add_library(microprofile INTERFACE) add_library(microprofile INTERFACE)
target_include_directories(microprofile INTERFACE ./microprofile) target_include_directories(microprofile INTERFACE ./microprofile)
# GCC bugs
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "12" AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND MINGW)
target_compile_options(microprofile INTERFACE "-Wno-array-bounds")
endif()
# libusb # libusb
if (NOT LIBUSB_FOUND OR YUZU_USE_BUNDLED_LIBUSB) if (NOT LIBUSB_FOUND OR YUZU_USE_BUNDLED_LIBUSB)
add_subdirectory(libusb) add_subdirectory(libusb)

View file

@ -429,7 +429,7 @@ void CommandGenerator::GenerateDataSourceCommand(ServerVoiceInfo& voice_info, Vo
in_params.node_id); in_params.node_id);
break; break;
default: default:
UNREACHABLE_MSG("Unimplemented sample format={}", in_params.sample_format); ASSERT_MSG(false, "Unimplemented sample format={}", in_params.sample_format);
} }
} }
} }
@ -1312,7 +1312,7 @@ void CommandGenerator::DecodeFromWaveBuffers(ServerVoiceInfo& voice_info, std::s
samples_to_read - samples_read, channel, temp_mix_offset); samples_to_read - samples_read, channel, temp_mix_offset);
break; break;
default: default:
UNREACHABLE_MSG("Unimplemented sample format={}", in_params.sample_format); ASSERT_MSG(false, "Unimplemented sample format={}", in_params.sample_format);
} }
temp_mix_offset += samples_decoded; temp_mix_offset += samples_decoded;

View file

@ -50,7 +50,7 @@ EffectBase* EffectContext::RetargetEffect(std::size_t i, EffectType effect) {
effects[i] = std::make_unique<EffectBiquadFilter>(); effects[i] = std::make_unique<EffectBiquadFilter>();
break; break;
default: default:
UNREACHABLE_MSG("Unimplemented effect {}", effect); ASSERT_MSG(false, "Unimplemented effect {}", effect);
effects[i] = std::make_unique<EffectStubbed>(); effects[i] = std::make_unique<EffectStubbed>();
} }
return GetInfo(i); return GetInfo(i);
@ -104,7 +104,7 @@ void EffectI3dl2Reverb::Update(EffectInfo::InParams& in_params) {
auto& params = GetParams(); auto& params = GetParams();
const auto* reverb_params = reinterpret_cast<I3dl2ReverbParams*>(in_params.raw.data()); const auto* reverb_params = reinterpret_cast<I3dl2ReverbParams*>(in_params.raw.data());
if (!ValidChannelCountForEffect(reverb_params->max_channels)) { if (!ValidChannelCountForEffect(reverb_params->max_channels)) {
UNREACHABLE_MSG("Invalid reverb max channel count {}", reverb_params->max_channels); ASSERT_MSG(false, "Invalid reverb max channel count {}", reverb_params->max_channels);
return; return;
} }

View file

@ -483,7 +483,7 @@ bool NodeStates::DepthFirstSearch(EdgeMatrix& edge_matrix) {
// Add more work // Add more work
index_stack.push(j); index_stack.push(j);
} else if (node_state == NodeStates::State::InFound) { } else if (node_state == NodeStates::State::InFound) {
UNREACHABLE_MSG("Node start marked as found"); ASSERT_MSG(false, "Node start marked as found");
ResetState(); ResetState();
return false; return false;
} }

View file

@ -114,7 +114,7 @@ void ServerVoiceInfo::UpdateParameters(const VoiceInfo::InParams& voice_in,
in_params.current_playstate = ServerPlayState::Play; in_params.current_playstate = ServerPlayState::Play;
break; break;
default: default:
UNREACHABLE_MSG("Unknown playstate {}", voice_in.play_state); ASSERT_MSG(false, "Unknown playstate {}", voice_in.play_state);
break; break;
} }
@ -410,7 +410,7 @@ bool ServerVoiceInfo::UpdateParametersForCommandGeneration(
return in_params.should_depop; return in_params.should_depop;
} }
default: default:
UNREACHABLE_MSG("Invalid playstate {}", in_params.current_playstate); ASSERT_MSG(false, "Invalid playstate {}", in_params.current_playstate);
} }
return false; return false;

View file

@ -6,8 +6,13 @@
#include "common/settings.h" #include "common/settings.h"
void assert_handle_failure() { void assert_fail_impl() {
if (Settings::values.use_debug_asserts) { if (Settings::values.use_debug_asserts) {
Crash(); Crash();
} }
} }
[[noreturn]] void unreachable_impl() {
Crash();
throw std::runtime_error("Unreachable code");
}

View file

@ -9,44 +9,43 @@
// Sometimes we want to try to continue even after hitting an assert. // Sometimes we want to try to continue even after hitting an assert.
// However touching this file yields a global recompilation as this header is included almost // However touching this file yields a global recompilation as this header is included almost
// everywhere. So let's just move the handling of the failed assert to a single cpp file. // everywhere. So let's just move the handling of the failed assert to a single cpp file.
void assert_handle_failure();
// For asserts we'd like to keep all the junk executed when an assert happens away from the void assert_fail_impl();
// important code in the function. One way of doing this is to put all the relevant code inside a [[noreturn]] void unreachable_impl();
// lambda and force the compiler to not inline it. Unfortunately, MSVC seems to have no syntax to
// specify __declspec on lambda functions, so what we do instead is define a noinline wrapper #ifdef _MSC_VER
// template that calls the lambda. This seems to generate an extra instruction at the call-site #define YUZU_NO_INLINE __declspec(noinline)
// compared to the ideal implementation (which wouldn't support ASSERT_MSG parameters), but is good #else
// enough for our purposes. #define YUZU_NO_INLINE __attribute__((noinline))
template <typename Fn>
#if defined(_MSC_VER)
[[msvc::noinline]]
#elif defined(__GNUC__)
[[gnu::cold, gnu::noinline]]
#endif #endif
static void
assert_noinline_call(const Fn& fn) {
fn();
assert_handle_failure();
}
#define ASSERT(_a_) \ #define ASSERT(_a_) \
do \ ([&]() YUZU_NO_INLINE { \
if (!(_a_)) { \ if (!(_a_)) [[unlikely]] { \
assert_noinline_call([] { LOG_CRITICAL(Debug, "Assertion Failed!"); }); \ LOG_CRITICAL(Debug, "Assertion Failed!"); \
assert_fail_impl(); \
} \ } \
while (0) }())
#define ASSERT_MSG(_a_, ...) \ #define ASSERT_MSG(_a_, ...) \
do \ ([&]() YUZU_NO_INLINE { \
if (!(_a_)) { \ if (!(_a_)) [[unlikely]] { \
assert_noinline_call([&] { LOG_CRITICAL(Debug, "Assertion Failed!\n" __VA_ARGS__); }); \ LOG_CRITICAL(Debug, "Assertion Failed!\n" __VA_ARGS__); \
assert_fail_impl(); \
} \ } \
while (0) }())
#define UNREACHABLE() \
do { \
LOG_CRITICAL(Debug, "Unreachable code!"); \
unreachable_impl(); \
} while (0)
#define UNREACHABLE() assert_noinline_call([] { LOG_CRITICAL(Debug, "Unreachable code!"); })
#define UNREACHABLE_MSG(...) \ #define UNREACHABLE_MSG(...) \
assert_noinline_call([&] { LOG_CRITICAL(Debug, "Unreachable code!\n" __VA_ARGS__); }) do { \
LOG_CRITICAL(Debug, "Unreachable code!\n" __VA_ARGS__); \
unreachable_impl(); \
} while (0)
#ifdef _DEBUG #ifdef _DEBUG
#define DEBUG_ASSERT(_a_) ASSERT(_a_) #define DEBUG_ASSERT(_a_) ASSERT(_a_)

View file

@ -147,7 +147,7 @@ void UpdateRescalingInfo() {
info.down_shift = 0; info.down_shift = 0;
break; break;
default: default:
UNREACHABLE(); ASSERT(false);
info.up_scale = 1; info.up_scale = 1;
info.down_shift = 0; info.down_shift = 0;
} }

View file

@ -140,7 +140,6 @@ u64 GetSignatureTypeDataSize(SignatureType type) {
return 0x3C; return 0x3C;
} }
UNREACHABLE(); UNREACHABLE();
return 0;
} }
u64 GetSignatureTypePaddingSize(SignatureType type) { u64 GetSignatureTypePaddingSize(SignatureType type) {
@ -155,7 +154,6 @@ u64 GetSignatureTypePaddingSize(SignatureType type) {
return 0x40; return 0x40;
} }
UNREACHABLE(); UNREACHABLE();
return 0;
} }
SignatureType Ticket::GetSignatureType() const { SignatureType Ticket::GetSignatureType() const {

View file

@ -419,7 +419,7 @@ std::optional<Core::Crypto::Key128> NCA::GetKeyAreaKey(NCASectionCryptoType type
Core::Crypto::Mode::ECB); Core::Crypto::Mode::ECB);
cipher.Transcode(key_area.data(), key_area.size(), key_area.data(), Core::Crypto::Op::Decrypt); cipher.Transcode(key_area.data(), key_area.size(), key_area.data(), Core::Crypto::Op::Decrypt);
Core::Crypto::Key128 out; Core::Crypto::Key128 out{};
if (type == NCASectionCryptoType::XTS) { if (type == NCASectionCryptoType::XTS) {
std::copy(key_area.begin(), key_area.begin() + 0x10, out.begin()); std::copy(key_area.begin(), key_area.begin() + 0x10, out.begin());
} else if (type == NCASectionCryptoType::CTR || type == NCASectionCryptoType::BKTR) { } else if (type == NCASectionCryptoType::CTR || type == NCASectionCryptoType::BKTR) {

View file

@ -50,7 +50,7 @@ std::pair<std::size_t, std::size_t> SearchBucketEntry(u64 offset, const BlockTyp
low = mid + 1; low = mid + 1;
} }
} }
UNREACHABLE_MSG("Offset could not be found in BKTR block."); ASSERT_MSG(false, "Offset could not be found in BKTR block.");
return {0, 0}; return {0, 0};
} }
} // Anonymous namespace } // Anonymous namespace

View file

@ -108,7 +108,7 @@ ContentRecordType GetCRTypeFromNCAType(NCAContentType type) {
// TODO(DarkLordZach): Peek at NCA contents to differentiate Manual and Legal. // TODO(DarkLordZach): Peek at NCA contents to differentiate Manual and Legal.
return ContentRecordType::HtmlDocument; return ContentRecordType::HtmlDocument;
default: default:
UNREACHABLE_MSG("Invalid NCAContentType={:02X}", type); ASSERT_MSG(false, "Invalid NCAContentType={:02X}", type);
return ContentRecordType{}; return ContentRecordType{};
} }
} }

View file

@ -144,7 +144,7 @@ VirtualFile RealVfsFilesystem::MoveFile(std::string_view old_path_, std::string_
LOG_ERROR(Service_FS, "Failed to open path {} in order to re-cache it", new_path); LOG_ERROR(Service_FS, "Failed to open path {} in order to re-cache it", new_path);
} }
} else { } else {
UNREACHABLE(); ASSERT(false);
return nullptr; return nullptr;
} }

View file

@ -65,7 +65,7 @@ void DefaultControllerApplet::ReconfigureControllers(std::function<void()> callb
controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::Handheld); controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::Handheld);
controller->Connect(true); controller->Connect(true);
} else { } else {
UNREACHABLE_MSG("Unable to add a new controller based on the given parameters!"); ASSERT_MSG(false, "Unable to add a new controller based on the given parameters!");
} }
} }

View file

@ -48,7 +48,7 @@ EmulatedController* HIDCore::GetEmulatedController(NpadIdType npad_id_type) {
return handheld.get(); return handheld.get();
case NpadIdType::Invalid: case NpadIdType::Invalid:
default: default:
UNREACHABLE_MSG("Invalid NpadIdType={}", npad_id_type); ASSERT_MSG(false, "Invalid NpadIdType={}", npad_id_type);
return nullptr; return nullptr;
} }
} }
@ -77,7 +77,7 @@ const EmulatedController* HIDCore::GetEmulatedController(NpadIdType npad_id_type
return handheld.get(); return handheld.get();
case NpadIdType::Invalid: case NpadIdType::Invalid:
default: default:
UNREACHABLE_MSG("Invalid NpadIdType={}", npad_id_type); ASSERT_MSG(false, "Invalid NpadIdType={}", npad_id_type);
return nullptr; return nullptr;
} }
} }

View file

@ -141,7 +141,7 @@ public:
if (index < DomainHandlerCount()) { if (index < DomainHandlerCount()) {
domain_handlers[index] = nullptr; domain_handlers[index] = nullptr;
} else { } else {
UNREACHABLE_MSG("Unexpected handler index {}", index); ASSERT_MSG(false, "Unexpected handler index {}", index);
} }
} }

View file

@ -244,7 +244,7 @@ void InitializeSlabHeaps(Core::System& system, KMemoryLayout& memory_layout) {
FOREACH_SLAB_TYPE(INITIALIZE_SLAB_HEAP) FOREACH_SLAB_TYPE(INITIALIZE_SLAB_HEAP)
// If we somehow get an invalid type, abort. // If we somehow get an invalid type, abort.
default: default:
UNREACHABLE_MSG("Unknown slab type: {}", slab_types[i]); ASSERT_MSG(false, "Unknown slab type: {}", slab_types[i]);
} }
// If we've hit the end of a gap, free it. // If we've hit the end of a gap, free it.

View file

@ -35,7 +35,7 @@ public:
case Svc::SignalType::SignalAndModifyByWaitingCountIfEqual: case Svc::SignalType::SignalAndModifyByWaitingCountIfEqual:
return SignalAndModifyByWaitingCountIfEqual(addr, value, count); return SignalAndModifyByWaitingCountIfEqual(addr, value, count);
} }
UNREACHABLE(); ASSERT(false);
return ResultUnknown; return ResultUnknown;
} }
@ -49,7 +49,7 @@ public:
case Svc::ArbitrationType::WaitIfEqual: case Svc::ArbitrationType::WaitIfEqual:
return WaitIfEqual(addr, value, timeout); return WaitIfEqual(addr, value, timeout);
} }
UNREACHABLE(); ASSERT(false);
return ResultUnknown; return ResultUnknown;
} }

View file

@ -84,7 +84,7 @@ u64 KAddressSpaceInfo::GetAddressSpaceStart(std::size_t width, Type type) {
ASSERT(IsAllowedIndexForAddress(AddressSpaceIndices39Bit[index])); ASSERT(IsAllowedIndexForAddress(AddressSpaceIndices39Bit[index]));
return AddressSpaceInfos[AddressSpaceIndices39Bit[index]].address; return AddressSpaceInfos[AddressSpaceIndices39Bit[index]].address;
} }
UNREACHABLE(); ASSERT(false);
return 0; return 0;
} }
@ -101,7 +101,7 @@ std::size_t KAddressSpaceInfo::GetAddressSpaceSize(std::size_t width, Type type)
ASSERT(IsAllowed39BitType(type)); ASSERT(IsAllowed39BitType(type));
return AddressSpaceInfos[AddressSpaceIndices39Bit[index]].size; return AddressSpaceInfos[AddressSpaceIndices39Bit[index]].size;
} }
UNREACHABLE(); ASSERT(false);
return 0; return 0;
} }

View file

@ -18,7 +18,7 @@ namespace Kernel {
class KernelCore; class KernelCore;
class KProcess; class KProcess;
#define KERNEL_AUTOOBJECT_TRAITS(CLASS, BASE_CLASS) \ #define KERNEL_AUTOOBJECT_TRAITS_IMPL(CLASS, BASE_CLASS, ATTRIBUTE) \
\ \
private: \ private: \
friend class ::Kernel::KClassTokenGenerator; \ friend class ::Kernel::KClassTokenGenerator; \
@ -40,16 +40,19 @@ public:
static constexpr const char* GetStaticTypeName() { \ static constexpr const char* GetStaticTypeName() { \
return TypeName; \ return TypeName; \
} \ } \
virtual TypeObj GetTypeObj() const { \ virtual TypeObj GetTypeObj() ATTRIBUTE { \
return GetStaticTypeObj(); \ return GetStaticTypeObj(); \
} \ } \
virtual const char* GetTypeName() const { \ virtual const char* GetTypeName() ATTRIBUTE { \
return GetStaticTypeName(); \ return GetStaticTypeName(); \
} \ } \
\ \
private: \ private: \
constexpr bool operator!=(const TypeObj& rhs) constexpr bool operator!=(const TypeObj& rhs)
#define KERNEL_AUTOOBJECT_TRAITS(CLASS, BASE_CLASS) \
KERNEL_AUTOOBJECT_TRAITS_IMPL(CLASS, BASE_CLASS, const override)
class KAutoObject { class KAutoObject {
protected: protected:
class TypeObj { class TypeObj {
@ -82,7 +85,7 @@ protected:
}; };
private: private:
KERNEL_AUTOOBJECT_TRAITS(KAutoObject, KAutoObject); KERNEL_AUTOOBJECT_TRAITS_IMPL(KAutoObject, KAutoObject, const);
public: public:
explicit KAutoObject(KernelCore& kernel_) : kernel(kernel_) { explicit KAutoObject(KernelCore& kernel_) : kernel(kernel_) {

View file

@ -49,6 +49,7 @@ private:
} }
} }
} }
UNREACHABLE();
}(); }();
template <typename T> template <typename T>

View file

@ -29,7 +29,7 @@ constexpr KMemoryManager::Pool GetPoolFromMemoryRegionType(u32 type) {
} else if ((type | KMemoryRegionType_DramSystemNonSecurePool) == type) { } else if ((type | KMemoryRegionType_DramSystemNonSecurePool) == type) {
return KMemoryManager::Pool::SystemNonSecure; return KMemoryManager::Pool::SystemNonSecure;
} else { } else {
UNREACHABLE_MSG("InvalidMemoryRegionType for conversion to Pool"); ASSERT_MSG(false, "InvalidMemoryRegionType for conversion to Pool");
return {}; return {};
} }
} }

View file

@ -35,7 +35,7 @@ constexpr std::size_t GetAddressSpaceWidthFromType(FileSys::ProgramAddressSpaceT
case FileSys::ProgramAddressSpaceType::Is39Bit: case FileSys::ProgramAddressSpaceType::Is39Bit:
return 39; return 39;
default: default:
UNREACHABLE(); ASSERT(false);
return {}; return {};
} }
} }
@ -128,7 +128,7 @@ ResultCode KPageTable::InitializeForProcess(FileSys::ProgramAddressSpaceType as_
const std::size_t needed_size{ const std::size_t needed_size{
(alias_region_size + heap_region_size + stack_region_size + kernel_map_region_size)}; (alias_region_size + heap_region_size + stack_region_size + kernel_map_region_size)};
if (alloc_size < needed_size) { if (alloc_size < needed_size) {
UNREACHABLE(); ASSERT(false);
return ResultOutOfMemory; return ResultOutOfMemory;
} }
@ -1430,7 +1430,7 @@ ResultCode KPageTable::SetProcessMemoryPermission(VAddr addr, std::size_t size,
new_state = KMemoryState::AliasCodeData; new_state = KMemoryState::AliasCodeData;
break; break;
default: default:
UNREACHABLE(); ASSERT(false);
} }
} }
@ -1823,9 +1823,7 @@ void KPageTable::AddRegionToPages(VAddr start, std::size_t num_pages,
VAddr addr{start}; VAddr addr{start};
while (addr < start + (num_pages * PageSize)) { while (addr < start + (num_pages * PageSize)) {
const PAddr paddr{GetPhysicalAddr(addr)}; const PAddr paddr{GetPhysicalAddr(addr)};
if (!paddr) { ASSERT(paddr != 0);
UNREACHABLE();
}
page_linked_list.AddBlock(paddr, 1); page_linked_list.AddBlock(paddr, 1);
addr += PageSize; addr += PageSize;
} }
@ -1856,7 +1854,7 @@ ResultCode KPageTable::Operate(VAddr addr, std::size_t num_pages, const KPageLin
system.Memory().MapMemoryRegion(page_table_impl, addr, size, node.GetAddress()); system.Memory().MapMemoryRegion(page_table_impl, addr, size, node.GetAddress());
break; break;
default: default:
UNREACHABLE(); ASSERT(false);
} }
addr += size; addr += size;
@ -1887,7 +1885,7 @@ ResultCode KPageTable::Operate(VAddr addr, std::size_t num_pages, KMemoryPermiss
case OperationType::ChangePermissionsAndRefresh: case OperationType::ChangePermissionsAndRefresh:
break; break;
default: default:
UNREACHABLE(); ASSERT(false);
} }
return ResultSuccess; return ResultSuccess;
} }
@ -1924,7 +1922,6 @@ VAddr KPageTable::GetRegionAddress(KMemoryState state) const {
return code_region_start; return code_region_start;
default: default:
UNREACHABLE(); UNREACHABLE();
return {};
} }
} }
@ -1960,7 +1957,6 @@ std::size_t KPageTable::GetRegionSize(KMemoryState state) const {
return code_region_end - code_region_start; return code_region_end - code_region_start;
default: default:
UNREACHABLE(); UNREACHABLE();
return {};
} }
} }

View file

@ -60,7 +60,7 @@ ResultCode KPort::EnqueueSession(KServerSession* session) {
if (auto session_ptr = server.GetSessionRequestHandler().lock()) { if (auto session_ptr = server.GetSessionRequestHandler().lock()) {
session_ptr->ClientConnected(server.AcceptSession()); session_ptr->ClientConnected(server.AcceptSession());
} else { } else {
UNREACHABLE(); ASSERT(false);
} }
return ResultSuccess; return ResultSuccess;

View file

@ -350,7 +350,7 @@ ResultCode KProcess::LoadFromMetadata(const FileSys::ProgramMetadata& metadata,
break; break;
default: default:
UNREACHABLE(); ASSERT(false);
} }
// Create TLS region // Create TLS region

View file

@ -97,13 +97,13 @@ ResultCode KServerSession::HandleDomainSyncRequest(Kernel::HLERequestContext& co
"object_id {} is too big! This probably means a recent service call " "object_id {} is too big! This probably means a recent service call "
"to {} needed to return a new interface!", "to {} needed to return a new interface!",
object_id, name); object_id, name);
UNREACHABLE(); ASSERT(false);
return ResultSuccess; // Ignore error if asserts are off return ResultSuccess; // Ignore error if asserts are off
} }
if (auto strong_ptr = manager->DomainHandler(object_id - 1).lock()) { if (auto strong_ptr = manager->DomainHandler(object_id - 1).lock()) {
return strong_ptr->HandleSyncRequest(*this, context); return strong_ptr->HandleSyncRequest(*this, context);
} else { } else {
UNREACHABLE(); ASSERT(false);
return ResultSuccess; return ResultSuccess;
} }

View file

@ -133,7 +133,7 @@ ResultCode KThread::Initialize(KThreadFunction func, uintptr_t arg, VAddr user_s
UNIMPLEMENTED(); UNIMPLEMENTED();
break; break;
default: default:
UNREACHABLE_MSG("KThread::Initialize: Unknown ThreadType {}", static_cast<u32>(type)); ASSERT_MSG(false, "KThread::Initialize: Unknown ThreadType {}", static_cast<u32>(type));
break; break;
} }
thread_type = type; thread_type = type;

View file

@ -212,7 +212,9 @@ struct KernelCore::Impl {
system_resource_limit = KResourceLimit::Create(system.Kernel()); system_resource_limit = KResourceLimit::Create(system.Kernel());
system_resource_limit->Initialize(&core_timing); system_resource_limit->Initialize(&core_timing);
const auto [total_size, kernel_size] = memory_layout->GetTotalAndKernelMemorySizes(); const auto sizes{memory_layout->GetTotalAndKernelMemorySizes()};
const auto total_size{sizes.first};
const auto kernel_size{sizes.second};
// If setting the default system values fails, then something seriously wrong has occurred. // If setting the default system values fails, then something seriously wrong has occurred.
ASSERT(system_resource_limit->SetLimitValue(LimitableResource::PhysicalMemory, total_size) ASSERT(system_resource_limit->SetLimitValue(LimitableResource::PhysicalMemory, total_size)

View file

@ -1876,7 +1876,7 @@ static void SleepThread(Core::System& system, s64 nanoseconds) {
KScheduler::YieldToAnyThread(kernel); KScheduler::YieldToAnyThread(kernel);
} else { } else {
// Nintendo does nothing at all if an otherwise invalid value is passed. // Nintendo does nothing at all if an otherwise invalid value is passed.
UNREACHABLE_MSG("Unimplemented sleep yield type '{:016X}'!", nanoseconds); ASSERT_MSG(false, "Unimplemented sleep yield type '{:016X}'!", nanoseconds);
} }
} }

View file

@ -178,7 +178,7 @@ ResultCode Controller::GetStatus() const {
} }
void Controller::ExecuteInteractive() { void Controller::ExecuteInteractive() {
UNREACHABLE_MSG("Attempted to call interactive execution on non-interactive applet."); ASSERT_MSG(false, "Attempted to call interactive execution on non-interactive applet.");
} }
void Controller::Execute() { void Controller::Execute() {

View file

@ -156,7 +156,7 @@ ResultCode Error::GetStatus() const {
} }
void Error::ExecuteInteractive() { void Error::ExecuteInteractive() {
UNREACHABLE_MSG("Unexpected interactive applet data!"); ASSERT_MSG(false, "Unexpected interactive applet data!");
} }
void Error::Execute() { void Error::Execute() {

View file

@ -76,7 +76,7 @@ ResultCode Auth::GetStatus() const {
} }
void Auth::ExecuteInteractive() { void Auth::ExecuteInteractive() {
UNREACHABLE_MSG("Unexpected interactive applet data."); ASSERT_MSG(false, "Unexpected interactive applet data.");
} }
void Auth::Execute() { void Auth::Execute() {
@ -175,7 +175,7 @@ ResultCode PhotoViewer::GetStatus() const {
} }
void PhotoViewer::ExecuteInteractive() { void PhotoViewer::ExecuteInteractive() {
UNREACHABLE_MSG("Unexpected interactive applet data."); ASSERT_MSG(false, "Unexpected interactive applet data.");
} }
void PhotoViewer::Execute() { void PhotoViewer::Execute() {

View file

@ -67,7 +67,7 @@ ResultCode MiiEdit::GetStatus() const {
} }
void MiiEdit::ExecuteInteractive() { void MiiEdit::ExecuteInteractive() {
UNREACHABLE_MSG("Attempted to call interactive execution on non-interactive applet."); ASSERT_MSG(false, "Attempted to call interactive execution on non-interactive applet.");
} }
void MiiEdit::Execute() { void MiiEdit::Execute() {

View file

@ -44,7 +44,7 @@ ResultCode ProfileSelect::GetStatus() const {
} }
void ProfileSelect::ExecuteInteractive() { void ProfileSelect::ExecuteInteractive() {
UNREACHABLE_MSG("Attempted to call interactive execution on non-interactive applet."); ASSERT_MSG(false, "Attempted to call interactive execution on non-interactive applet.");
} }
void ProfileSelect::Execute() { void ProfileSelect::Execute() {

View file

@ -71,7 +71,7 @@ void SoftwareKeyboard::Initialize() {
InitializeBackground(applet_mode); InitializeBackground(applet_mode);
break; break;
default: default:
UNREACHABLE_MSG("Invalid LibraryAppletMode={}", applet_mode); ASSERT_MSG(false, "Invalid LibraryAppletMode={}", applet_mode);
break; break;
} }
} }

View file

@ -279,7 +279,7 @@ void WebBrowser::Initialize() {
InitializeLobby(); InitializeLobby();
break; break;
default: default:
UNREACHABLE_MSG("Invalid ShimKind={}", web_arg_header.shim_kind); ASSERT_MSG(false, "Invalid ShimKind={}", web_arg_header.shim_kind);
break; break;
} }
} }
@ -320,7 +320,7 @@ void WebBrowser::Execute() {
ExecuteLobby(); ExecuteLobby();
break; break;
default: default:
UNREACHABLE_MSG("Invalid ShimKind={}", web_arg_header.shim_kind); ASSERT_MSG(false, "Invalid ShimKind={}", web_arg_header.shim_kind);
WebBrowserExit(WebExitReason::EndButtonPressed); WebBrowserExit(WebExitReason::EndButtonPressed);
break; break;
} }

View file

@ -899,7 +899,7 @@ void FSP_SRV::OpenSaveDataFileSystem(Kernel::HLERequestContext& ctx) {
case FileSys::SaveDataSpaceId::TemporaryStorage: case FileSys::SaveDataSpaceId::TemporaryStorage:
case FileSys::SaveDataSpaceId::ProperSystem: case FileSys::SaveDataSpaceId::ProperSystem:
case FileSys::SaveDataSpaceId::SafeMode: case FileSys::SaveDataSpaceId::SafeMode:
UNREACHABLE(); ASSERT(false);
} }
auto filesystem = std::make_shared<IFileSystem>(system, std::move(dir.Unwrap()), auto filesystem = std::make_shared<IFileSystem>(system, std::move(dir.Unwrap()),

View file

@ -160,7 +160,7 @@ void Controller_NPad::InitNewlyAddedController(Core::HID::NpadIdType npad_id) {
shared_memory->system_properties.raw = 0; shared_memory->system_properties.raw = 0;
switch (controller_type) { switch (controller_type) {
case Core::HID::NpadStyleIndex::None: case Core::HID::NpadStyleIndex::None:
UNREACHABLE(); ASSERT(false);
break; break;
case Core::HID::NpadStyleIndex::ProController: case Core::HID::NpadStyleIndex::ProController:
shared_memory->style_tag.fullkey.Assign(1); shared_memory->style_tag.fullkey.Assign(1);
@ -422,7 +422,7 @@ void Controller_NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
libnx_state.connection_status.is_connected.Assign(1); libnx_state.connection_status.is_connected.Assign(1);
switch (controller_type) { switch (controller_type) {
case Core::HID::NpadStyleIndex::None: case Core::HID::NpadStyleIndex::None:
UNREACHABLE(); ASSERT(false);
break; break;
case Core::HID::NpadStyleIndex::ProController: case Core::HID::NpadStyleIndex::ProController:
case Core::HID::NpadStyleIndex::NES: case Core::HID::NpadStyleIndex::NES:
@ -597,7 +597,7 @@ void Controller_NPad::OnMotionUpdate(const Core::Timing::CoreTiming& core_timing
switch (controller_type) { switch (controller_type) {
case Core::HID::NpadStyleIndex::None: case Core::HID::NpadStyleIndex::None:
UNREACHABLE(); ASSERT(false);
break; break;
case Core::HID::NpadStyleIndex::ProController: case Core::HID::NpadStyleIndex::ProController:
case Core::HID::NpadStyleIndex::Pokeball: case Core::HID::NpadStyleIndex::Pokeball:
@ -856,7 +856,7 @@ void Controller_NPad::VibrateController(
} }
if (vibration_device_handle.device_index == Core::HID::DeviceIndex::None) { if (vibration_device_handle.device_index == Core::HID::DeviceIndex::None) {
UNREACHABLE_MSG("DeviceIndex should never be None!"); ASSERT_MSG(false, "DeviceIndex should never be None!");
return; return;
} }

View file

@ -1441,7 +1441,7 @@ void Hid::GetVibrationDeviceInfo(Kernel::HLERequestContext& ctx) {
break; break;
case Core::HID::DeviceIndex::None: case Core::HID::DeviceIndex::None:
default: default:
UNREACHABLE_MSG("DeviceIndex should never be None!"); ASSERT_MSG(false, "DeviceIndex should never be None!");
vibration_device_info.position = Core::HID::VibrationDevicePosition::None; vibration_device_info.position = Core::HID::VibrationDevicePosition::None;
break; break;
} }

View file

@ -347,7 +347,7 @@ public:
} }
if (!succeeded) { if (!succeeded) {
UNREACHABLE_MSG("Out of address space!"); ASSERT_MSG(false, "Out of address space!");
return Kernel::ResultOutOfMemory; return Kernel::ResultOutOfMemory;
} }

View file

@ -290,7 +290,7 @@ MiiStoreData BuildRandomStoreData(Age age, Gender gender, Race race, const Commo
u8 glasses_type{}; u8 glasses_type{};
while (glasses_type_start < glasses_type_info.values[glasses_type]) { while (glasses_type_start < glasses_type_info.values[glasses_type]) {
if (++glasses_type >= glasses_type_info.values_count) { if (++glasses_type >= glasses_type_info.values_count) {
UNREACHABLE(); ASSERT(false);
break; break;
} }
} }

View file

@ -23,7 +23,7 @@ u32 SyncpointManager::AllocateSyncpoint() {
return syncpoint_id; return syncpoint_id;
} }
} }
UNREACHABLE_MSG("No more available syncpoints!"); ASSERT_MSG(false, "No more available syncpoints!");
return {}; return {};
} }

View file

@ -659,7 +659,7 @@ Status BufferQueueProducer::Query(NativeWindow what, s32* out_value) {
value = core->consumer_usage_bit; value = core->consumer_usage_bit;
break; break;
default: default:
UNREACHABLE(); ASSERT(false);
return Status::BadValue; return Status::BadValue;
} }

View file

@ -48,12 +48,12 @@ ResultCode StandardUserSystemClockCore::GetClockContext(Core::System& system,
} }
ResultCode StandardUserSystemClockCore::Flush(const SystemClockContext&) { ResultCode StandardUserSystemClockCore::Flush(const SystemClockContext&) {
UNREACHABLE(); UNIMPLEMENTED();
return ERROR_NOT_IMPLEMENTED; return ERROR_NOT_IMPLEMENTED;
} }
ResultCode StandardUserSystemClockCore::SetClockContext(const SystemClockContext&) { ResultCode StandardUserSystemClockCore::SetClockContext(const SystemClockContext&) {
UNREACHABLE(); UNIMPLEMENTED();
return ERROR_NOT_IMPLEMENTED; return ERROR_NOT_IMPLEMENTED;
} }

View file

@ -111,7 +111,7 @@ struct TimeManager::Impl final {
FileSys::VirtualFile& vfs_file) { FileSys::VirtualFile& vfs_file) {
if (time_zone_content_manager.GetTimeZoneManager().SetDeviceLocationNameWithTimeZoneRule( if (time_zone_content_manager.GetTimeZoneManager().SetDeviceLocationNameWithTimeZoneRule(
location_name, vfs_file) != ResultSuccess) { location_name, vfs_file) != ResultSuccess) {
UNREACHABLE(); ASSERT(false);
return; return;
} }
@ -155,7 +155,7 @@ struct TimeManager::Impl final {
} else { } else {
if (standard_local_system_clock_core.SetCurrentTime(system_, posix_time) != if (standard_local_system_clock_core.SetCurrentTime(system_, posix_time) !=
ResultSuccess) { ResultSuccess) {
UNREACHABLE(); ASSERT(false);
return; return;
} }
} }
@ -170,7 +170,7 @@ struct TimeManager::Impl final {
if (standard_network_system_clock_core.SetSystemClockContext(clock_context) != if (standard_network_system_clock_core.SetSystemClockContext(clock_context) !=
ResultSuccess) { ResultSuccess) {
UNREACHABLE(); ASSERT(false);
return; return;
} }
@ -183,7 +183,7 @@ struct TimeManager::Impl final {
Clock::SteadyClockTimePoint steady_clock_time_point) { Clock::SteadyClockTimePoint steady_clock_time_point) {
if (standard_user_system_clock_core.SetAutomaticCorrectionEnabled( if (standard_user_system_clock_core.SetAutomaticCorrectionEnabled(
system_, is_automatic_correction_enabled) != ResultSuccess) { system_, is_automatic_correction_enabled) != ResultSuccess) {
UNREACHABLE(); ASSERT(false);
return; return;
} }
@ -203,7 +203,7 @@ struct TimeManager::Impl final {
if (GetStandardLocalSystemClockCore() if (GetStandardLocalSystemClockCore()
.SetCurrentTime(system_, timespan.ToSeconds()) .SetCurrentTime(system_, timespan.ToSeconds())
.IsError()) { .IsError()) {
UNREACHABLE(); ASSERT(false);
return; return;
} }
} }

View file

@ -279,7 +279,7 @@ static constexpr int TransitionTime(int year, Rule rule, int offset) {
break; break;
} }
default: default:
UNREACHABLE(); ASSERT(false);
} }
return value + rule.transition_time + offset; return value + rule.transition_time + offset;
} }

View file

@ -128,11 +128,10 @@ std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::KProcess& process, Core::
// Apply patches if necessary // Apply patches if necessary
if (pm && (pm->HasNSOPatch(nso_header.build_id) || Settings::values.dump_nso)) { if (pm && (pm->HasNSOPatch(nso_header.build_id) || Settings::values.dump_nso)) {
std::vector<u8> pi_header; std::vector<u8> pi_header(sizeof(NSOHeader) + program_image.size());
pi_header.insert(pi_header.begin(), reinterpret_cast<u8*>(&nso_header), std::memcpy(pi_header.data(), &nso_header, sizeof(NSOHeader));
reinterpret_cast<u8*>(&nso_header) + sizeof(NSOHeader)); std::memcpy(pi_header.data() + sizeof(NSOHeader), program_image.data(),
pi_header.insert(pi_header.begin() + sizeof(NSOHeader), program_image.data(), program_image.size());
program_image.data() + program_image.size());
pi_header = pm->PatchNSO(pi_header, nso_file.GetName()); pi_header = pm->PatchNSO(pi_header, nso_file.GetName());

View file

@ -25,7 +25,6 @@ u64 MemoryReadWidth(Core::Memory::Memory& memory, u32 width, VAddr addr) {
return memory.Read64(addr); return memory.Read64(addr);
default: default:
UNREACHABLE(); UNREACHABLE();
return 0;
} }
} }

View file

@ -58,7 +58,7 @@ public:
[[nodiscard]] Stack Remove(Token token) const; [[nodiscard]] Stack Remove(Token token) const;
private: private:
boost::container::small_vector<StackEntry, 3> entries; std::vector<StackEntry> entries;
}; };
struct IndirectBranch { struct IndirectBranch {

View file

@ -224,7 +224,7 @@ void Codec::Decode() {
vp9_hidden_frame = vp9_decoder->WasFrameHidden(); vp9_hidden_frame = vp9_decoder->WasFrameHidden();
return vp9_decoder->GetFrameBytes(); return vp9_decoder->GetFrameBytes();
default: default:
UNREACHABLE(); ASSERT(false);
return std::vector<u8>{}; return std::vector<u8>{};
} }
}(); }();

View file

@ -228,7 +228,7 @@ void Vic::WriteYUVFrame(const AVFrame* frame, const VicConfig& config) {
break; break;
} }
default: default:
UNREACHABLE(); ASSERT(false);
break; break;
} }
gpu.MemoryManager().WriteBlock(output_surface_chroma_address, chroma_buffer.data(), gpu.MemoryManager().WriteBlock(output_surface_chroma_address, chroma_buffer.data(),

View file

@ -202,7 +202,7 @@ public:
case Size::Size_11_11_10: case Size::Size_11_11_10:
return 3; return 3;
default: default:
UNREACHABLE(); ASSERT(false);
return 1; return 1;
} }
} }
@ -238,7 +238,7 @@ public:
case Size::Size_11_11_10: case Size::Size_11_11_10:
return 4; return 4;
default: default:
UNREACHABLE(); ASSERT(false);
return 1; return 1;
} }
} }
@ -274,7 +274,7 @@ public:
case Size::Size_11_11_10: case Size::Size_11_11_10:
return "11_11_10"; return "11_11_10";
default: default:
UNREACHABLE(); ASSERT(false);
return {}; return {};
} }
} }
@ -296,7 +296,7 @@ public:
case Type::Float: case Type::Float:
return "FLOAT"; return "FLOAT";
} }
UNREACHABLE(); ASSERT(false);
return {}; return {};
} }
@ -336,7 +336,7 @@ public:
case 3: case 3:
return {x3, y3}; return {x3, y3};
default: default:
UNREACHABLE(); ASSERT(false);
return {0, 0}; return {0, 0};
} }
} }
@ -1193,7 +1193,7 @@ public:
case IndexFormat::UnsignedInt: case IndexFormat::UnsignedInt:
return 4; return 4;
} }
UNREACHABLE(); ASSERT(false);
return 1; return 1;
} }

View file

@ -62,7 +62,7 @@ void MaxwellDMA::Launch() {
if (!is_src_pitch && !is_dst_pitch) { if (!is_src_pitch && !is_dst_pitch) {
// If both the source and the destination are in block layout, assert. // If both the source and the destination are in block layout, assert.
UNREACHABLE_MSG("Tiled->Tiled DMA transfers are not yet implemented"); UNIMPLEMENTED_MSG("Tiled->Tiled DMA transfers are not yet implemented");
return; return;
} }
@ -260,7 +260,7 @@ void MaxwellDMA::ReleaseSemaphore() {
memory_manager.Write<u64>(address + 8, system.GPU().GetTicks()); memory_manager.Write<u64>(address + 8, system.GPU().GetTicks());
break; break;
default: default:
UNREACHABLE_MSG("Unknown semaphore type: {}", static_cast<u32>(type.Value())); ASSERT_MSG(false, "Unknown semaphore type: {}", static_cast<u32>(type.Value()));
} }
} }

View file

@ -50,7 +50,7 @@ static void RunThread(std::stop_token stop_token, Core::System& system,
} else if (const auto* invalidate = std::get_if<InvalidateRegionCommand>(&next.data)) { } else if (const auto* invalidate = std::get_if<InvalidateRegionCommand>(&next.data)) {
rasterizer->OnCPUWrite(invalidate->addr, invalidate->size); rasterizer->OnCPUWrite(invalidate->addr, invalidate->size);
} else { } else {
UNREACHABLE(); ASSERT(false);
} }
state.signaled_fence.store(next.fence); state.signaled_fence.store(next.fence);
if (next.block) { if (next.block) {

View file

@ -71,7 +71,7 @@ void MacroEngine::Execute(u32 method, const std::vector<u32>& parameters) {
} }
} }
if (!mid_method.has_value()) { if (!mid_method.has_value()) {
UNREACHABLE_MSG("Macro 0x{0:x} was not uploaded", method); ASSERT_MSG(false, "Macro 0x{0:x} was not uploaded", method);
return; return;
} }
} }

View file

@ -308,7 +308,6 @@ bool MacroInterpreterImpl::EvaluateBranchCondition(Macro::BranchCondition cond,
return value != 0; return value != 0;
} }
UNREACHABLE(); UNREACHABLE();
return true;
} }
Macro::Opcode MacroInterpreterImpl::GetOpcode() const { Macro::Opcode MacroInterpreterImpl::GetOpcode() const {

View file

@ -411,7 +411,7 @@ void MacroJITx64Impl::Compile_Branch(Macro::Opcode opcode) {
Xbyak::Label end; Xbyak::Label end;
auto value = Compile_GetRegister(opcode.src_a, eax); auto value = Compile_GetRegister(opcode.src_a, eax);
test(value, value); cmp(value, 0); // test(value, value);
if (optimizer.has_delayed_pc) { if (optimizer.has_delayed_pc) {
switch (opcode.branch_condition) { switch (opcode.branch_condition) {
case Macro::BranchCondition::Zero: case Macro::BranchCondition::Zero:

View file

@ -67,7 +67,7 @@ void MemoryManager::Unmap(GPUVAddr gpu_addr, std::size_t size) {
ASSERT(it->first == gpu_addr); ASSERT(it->first == gpu_addr);
map_ranges.erase(it); map_ranges.erase(it);
} else { } else {
UNREACHABLE_MSG("Unmapping non-existent GPU address=0x{:x}", gpu_addr); ASSERT_MSG(false, "Unmapping non-existent GPU address=0x{:x}", gpu_addr);
} }
const auto submapped_ranges = GetSubmappedRange(gpu_addr, size); const auto submapped_ranges = GetSubmappedRange(gpu_addr, size);
@ -206,7 +206,7 @@ T MemoryManager::Read(GPUVAddr addr) const {
return value; return value;
} }
UNREACHABLE(); ASSERT(false);
return {}; return {};
} }
@ -219,7 +219,7 @@ void MemoryManager::Write(GPUVAddr addr, T data) {
return; return;
} }
UNREACHABLE(); ASSERT(false);
} }
template u8 MemoryManager::Read<u8>(GPUVAddr addr) const; template u8 MemoryManager::Read<u8>(GPUVAddr addr) const;

View file

@ -48,7 +48,7 @@ GLenum Stage(size_t stage_index) {
case 4: case 4:
return GL_FRAGMENT_SHADER; return GL_FRAGMENT_SHADER;
} }
UNREACHABLE_MSG("{}", stage_index); ASSERT_MSG(false, "{}", stage_index);
return GL_NONE; return GL_NONE;
} }
@ -65,7 +65,7 @@ GLenum AssemblyStage(size_t stage_index) {
case 4: case 4:
return GL_FRAGMENT_PROGRAM_NV; return GL_FRAGMENT_PROGRAM_NV;
} }
UNREACHABLE_MSG("{}", stage_index); ASSERT_MSG(false, "{}", stage_index);
return GL_NONE; return GL_NONE;
} }

View file

@ -85,7 +85,7 @@ Shader::RuntimeInfo MakeRuntimeInfo(const GraphicsPipelineKey& key,
case Maxwell::TessellationPrimitive::Quads: case Maxwell::TessellationPrimitive::Quads:
return Shader::TessPrimitive::Quads; return Shader::TessPrimitive::Quads;
} }
UNREACHABLE(); ASSERT(false);
return Shader::TessPrimitive::Triangles; return Shader::TessPrimitive::Triangles;
}(); }();
info.tess_spacing = [&] { info.tess_spacing = [&] {
@ -97,7 +97,7 @@ Shader::RuntimeInfo MakeRuntimeInfo(const GraphicsPipelineKey& key,
case Maxwell::TessellationSpacing::FractionalEven: case Maxwell::TessellationSpacing::FractionalEven:
return Shader::TessSpacing::FractionalEven; return Shader::TessSpacing::FractionalEven;
} }
UNREACHABLE(); ASSERT(false);
return Shader::TessSpacing::Equal; return Shader::TessSpacing::Equal;
}(); }();
break; break;

View file

@ -83,7 +83,7 @@ GLenum ImageTarget(const VideoCommon::ImageInfo& info) {
case ImageType::Buffer: case ImageType::Buffer:
return GL_TEXTURE_BUFFER; return GL_TEXTURE_BUFFER;
} }
UNREACHABLE_MSG("Invalid image type={}", info.type); ASSERT_MSG(false, "Invalid image type={}", info.type);
return GL_NONE; return GL_NONE;
} }
@ -107,7 +107,7 @@ GLenum ImageTarget(Shader::TextureType type, int num_samples = 1) {
case Shader::TextureType::Buffer: case Shader::TextureType::Buffer:
return GL_TEXTURE_BUFFER; return GL_TEXTURE_BUFFER;
} }
UNREACHABLE_MSG("Invalid image view type={}", type); ASSERT_MSG(false, "Invalid image view type={}", type);
return GL_NONE; return GL_NONE;
} }
@ -119,7 +119,7 @@ GLenum TextureMode(PixelFormat format, bool is_first) {
case PixelFormat::S8_UINT_D24_UNORM: case PixelFormat::S8_UINT_D24_UNORM:
return is_first ? GL_STENCIL_INDEX : GL_DEPTH_COMPONENT; return is_first ? GL_STENCIL_INDEX : GL_DEPTH_COMPONENT;
default: default:
UNREACHABLE(); ASSERT(false);
return GL_DEPTH_COMPONENT; return GL_DEPTH_COMPONENT;
} }
} }
@ -140,7 +140,7 @@ GLint Swizzle(SwizzleSource source) {
case SwizzleSource::OneFloat: case SwizzleSource::OneFloat:
return GL_ONE; return GL_ONE;
} }
UNREACHABLE_MSG("Invalid swizzle source={}", source); ASSERT_MSG(false, "Invalid swizzle source={}", source);
return GL_NONE; return GL_NONE;
} }
@ -197,7 +197,7 @@ GLint ConvertA5B5G5R1_UNORM(SwizzleSource source) {
case SwizzleSource::OneFloat: case SwizzleSource::OneFloat:
return GL_ONE; return GL_ONE;
} }
UNREACHABLE_MSG("Invalid swizzle source={}", source); ASSERT_MSG(false, "Invalid swizzle source={}", source);
return GL_NONE; return GL_NONE;
} }
@ -381,10 +381,10 @@ OGLTexture MakeImage(const VideoCommon::ImageInfo& info, GLenum gl_internal_form
glTextureStorage3D(handle, gl_num_levels, gl_internal_format, width, height, depth); glTextureStorage3D(handle, gl_num_levels, gl_internal_format, width, height, depth);
break; break;
case GL_TEXTURE_BUFFER: case GL_TEXTURE_BUFFER:
UNREACHABLE(); ASSERT(false);
break; break;
default: default:
UNREACHABLE_MSG("Invalid target=0x{:x}", target); ASSERT_MSG(false, "Invalid target=0x{:x}", target);
break; break;
} }
return texture; return texture;
@ -420,7 +420,7 @@ OGLTexture MakeImage(const VideoCommon::ImageInfo& info, GLenum gl_internal_form
case Shader::ImageFormat::R32G32B32A32_UINT: case Shader::ImageFormat::R32G32B32A32_UINT:
return GL_RGBA32UI; return GL_RGBA32UI;
} }
UNREACHABLE_MSG("Invalid image format={}", format); ASSERT_MSG(false, "Invalid image format={}", format);
return GL_R32UI; return GL_R32UI;
} }
@ -579,7 +579,7 @@ void TextureCacheRuntime::EmulateCopyImage(Image& dst, Image& src,
} else if (IsPixelFormatBGR(dst.info.format) || IsPixelFormatBGR(src.info.format)) { } else if (IsPixelFormatBGR(dst.info.format) || IsPixelFormatBGR(src.info.format)) {
format_conversion_pass.ConvertImage(dst, src, copies); format_conversion_pass.ConvertImage(dst, src, copies);
} else { } else {
UNREACHABLE(); ASSERT(false);
} }
} }
@ -620,7 +620,7 @@ void TextureCacheRuntime::AccelerateImageUpload(Image& image, const ImageBufferM
case ImageType::Linear: case ImageType::Linear:
return util_shaders.PitchUpload(image, map, swizzles); return util_shaders.PitchUpload(image, map, swizzles);
default: default:
UNREACHABLE(); ASSERT(false);
break; break;
} }
} }
@ -639,7 +639,7 @@ FormatProperties TextureCacheRuntime::FormatInfo(ImageType type, GLenum internal
case ImageType::e3D: case ImageType::e3D:
return format_properties[2].at(internal_format); return format_properties[2].at(internal_format);
default: default:
UNREACHABLE(); ASSERT(false);
return FormatProperties{}; return FormatProperties{};
} }
} }
@ -888,7 +888,7 @@ void Image::CopyBufferToImage(const VideoCommon::BufferImageCopy& copy, size_t b
} }
break; break;
default: default:
UNREACHABLE(); ASSERT(false);
} }
} }
@ -924,7 +924,7 @@ void Image::CopyImageToBuffer(const VideoCommon::BufferImageCopy& copy, size_t b
depth = copy.image_extent.depth; depth = copy.image_extent.depth;
break; break;
default: default:
UNREACHABLE(); ASSERT(false);
} }
// Compressed formats don't have a pixel format or type // Compressed formats don't have a pixel format or type
const bool is_compressed = gl_format == GL_NONE; const bool is_compressed = gl_format == GL_NONE;
@ -950,7 +950,7 @@ void Image::Scale(bool up_scale) {
case SurfaceType::DepthStencil: case SurfaceType::DepthStencil:
return GL_DEPTH_STENCIL_ATTACHMENT; return GL_DEPTH_STENCIL_ATTACHMENT;
default: default:
UNREACHABLE(); ASSERT(false);
return GL_COLOR_ATTACHMENT0; return GL_COLOR_ATTACHMENT0;
} }
}(); }();
@ -965,7 +965,7 @@ void Image::Scale(bool up_scale) {
case SurfaceType::DepthStencil: case SurfaceType::DepthStencil:
return GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT; return GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT;
default: default:
UNREACHABLE(); ASSERT(false);
return GL_COLOR_BUFFER_BIT; return GL_COLOR_BUFFER_BIT;
} }
}(); }();
@ -980,7 +980,7 @@ void Image::Scale(bool up_scale) {
case SurfaceType::DepthStencil: case SurfaceType::DepthStencil:
return 3; return 3;
default: default:
UNREACHABLE(); ASSERT(false);
return 0; return 0;
} }
}(); }();
@ -1045,7 +1045,7 @@ bool Image::ScaleUp(bool ignore) {
return false; return false;
} }
if (info.type == ImageType::Linear) { if (info.type == ImageType::Linear) {
UNREACHABLE(); ASSERT(false);
return false; return false;
} }
flags |= ImageFlagBits::Rescaled; flags |= ImageFlagBits::Rescaled;
@ -1139,7 +1139,7 @@ ImageView::ImageView(TextureCacheRuntime& runtime, const VideoCommon::ImageViewI
UNIMPLEMENTED(); UNIMPLEMENTED();
break; break;
case ImageViewType::Buffer: case ImageViewType::Buffer:
UNREACHABLE(); ASSERT(false);
break; break;
} }
switch (info.type) { switch (info.type) {
@ -1319,7 +1319,7 @@ Framebuffer::Framebuffer(TextureCacheRuntime& runtime, std::span<ImageView*, NUM
buffer_bits |= GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT; buffer_bits |= GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT;
break; break;
default: default:
UNREACHABLE(); ASSERT(false);
buffer_bits |= GL_DEPTH_BUFFER_BIT; buffer_bits |= GL_DEPTH_BUFFER_BIT;
break; break;
} }

View file

@ -206,7 +206,7 @@ inline GLenum IndexFormat(Maxwell::IndexFormat index_format) {
case Maxwell::IndexFormat::UnsignedInt: case Maxwell::IndexFormat::UnsignedInt:
return GL_UNSIGNED_INT; return GL_UNSIGNED_INT;
} }
UNREACHABLE_MSG("Invalid index_format={}", index_format); ASSERT_MSG(false, "Invalid index_format={}", index_format);
return {}; return {};
} }
@ -243,7 +243,7 @@ inline GLenum PrimitiveTopology(Maxwell::PrimitiveTopology topology) {
case Maxwell::PrimitiveTopology::Patches: case Maxwell::PrimitiveTopology::Patches:
return GL_PATCHES; return GL_PATCHES;
} }
UNREACHABLE_MSG("Invalid topology={}", topology); ASSERT_MSG(false, "Invalid topology={}", topology);
return GL_POINTS; return GL_POINTS;
} }
@ -271,8 +271,8 @@ inline GLenum TextureFilterMode(Tegra::Texture::TextureFilter filter_mode,
} }
break; break;
} }
UNREACHABLE_MSG("Invalid texture filter mode={} and mipmap filter mode={}", filter_mode, ASSERT_MSG(false, "Invalid texture filter mode={} and mipmap filter mode={}", filter_mode,
mipmap_filter_mode); mipmap_filter_mode);
return GL_NEAREST; return GL_NEAREST;
} }
@ -550,7 +550,7 @@ inline GLenum PolygonMode(Maxwell::PolygonMode polygon_mode) {
case Maxwell::PolygonMode::Fill: case Maxwell::PolygonMode::Fill:
return GL_FILL; return GL_FILL;
} }
UNREACHABLE_MSG("Invalid polygon mode={}", polygon_mode); ASSERT_MSG(false, "Invalid polygon mode={}", polygon_mode);
return GL_FILL; return GL_FILL;
} }
@ -563,7 +563,7 @@ inline GLenum ReductionFilter(Tegra::Texture::SamplerReduction filter) {
case Tegra::Texture::SamplerReduction::Max: case Tegra::Texture::SamplerReduction::Max:
return GL_MAX; return GL_MAX;
} }
UNREACHABLE_MSG("Invalid reduction filter={}", static_cast<int>(filter)); ASSERT_MSG(false, "Invalid reduction filter={}", static_cast<int>(filter));
return GL_WEIGHTED_AVERAGE_ARB; return GL_WEIGHTED_AVERAGE_ARB;
} }

View file

@ -79,7 +79,7 @@ const char* GetSource(GLenum source) {
case GL_DEBUG_SOURCE_OTHER: case GL_DEBUG_SOURCE_OTHER:
return "OTHER"; return "OTHER";
default: default:
UNREACHABLE(); ASSERT(false);
return "Unknown source"; return "Unknown source";
} }
} }
@ -101,7 +101,7 @@ const char* GetType(GLenum type) {
case GL_DEBUG_TYPE_MARKER: case GL_DEBUG_TYPE_MARKER:
return "MARKER"; return "MARKER";
default: default:
UNREACHABLE(); ASSERT(false);
return "Unknown type"; return "Unknown type";
} }
} }

View file

@ -282,7 +282,7 @@ GLenum StoreFormat(u32 bytes_per_block) {
case 16: case 16:
return GL_RGBA32UI; return GL_RGBA32UI;
} }
UNREACHABLE(); ASSERT(false);
return GL_R8UI; return GL_R8UI;
} }

View file

@ -25,7 +25,7 @@ VkFilter Filter(Tegra::Texture::TextureFilter filter) {
case Tegra::Texture::TextureFilter::Linear: case Tegra::Texture::TextureFilter::Linear:
return VK_FILTER_LINEAR; return VK_FILTER_LINEAR;
} }
UNREACHABLE_MSG("Invalid sampler filter={}", filter); ASSERT_MSG(false, "Invalid sampler filter={}", filter);
return {}; return {};
} }
@ -42,7 +42,7 @@ VkSamplerMipmapMode MipmapMode(Tegra::Texture::TextureMipmapFilter mipmap_filter
case Tegra::Texture::TextureMipmapFilter::Linear: case Tegra::Texture::TextureMipmapFilter::Linear:
return VK_SAMPLER_MIPMAP_MODE_LINEAR; return VK_SAMPLER_MIPMAP_MODE_LINEAR;
} }
UNREACHABLE_MSG("Invalid sampler mipmap mode={}", mipmap_filter); ASSERT_MSG(false, "Invalid sampler mipmap mode={}", mipmap_filter);
return {}; return {};
} }
@ -70,7 +70,7 @@ VkSamplerAddressMode WrapMode(const Device& device, Tegra::Texture::WrapMode wra
case Tegra::Texture::TextureFilter::Linear: case Tegra::Texture::TextureFilter::Linear:
return VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER; return VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER;
} }
UNREACHABLE(); ASSERT(false);
return VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE; return VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
case Tegra::Texture::WrapMode::MirrorOnceClampToEdge: case Tegra::Texture::WrapMode::MirrorOnceClampToEdge:
return VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE; return VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE;
@ -744,7 +744,7 @@ VkViewportCoordinateSwizzleNV ViewportSwizzle(Maxwell::ViewportSwizzle swizzle)
case Maxwell::ViewportSwizzle::NegativeW: case Maxwell::ViewportSwizzle::NegativeW:
return VK_VIEWPORT_COORDINATE_SWIZZLE_NEGATIVE_W_NV; return VK_VIEWPORT_COORDINATE_SWIZZLE_NEGATIVE_W_NV;
} }
UNREACHABLE_MSG("Invalid swizzle={}", swizzle); ASSERT_MSG(false, "Invalid swizzle={}", swizzle);
return {}; return {};
} }
@ -757,7 +757,7 @@ VkSamplerReductionMode SamplerReduction(Tegra::Texture::SamplerReduction reducti
case Tegra::Texture::SamplerReduction::Max: case Tegra::Texture::SamplerReduction::Max:
return VK_SAMPLER_REDUCTION_MODE_MAX_EXT; return VK_SAMPLER_REDUCTION_MODE_MAX_EXT;
} }
UNREACHABLE_MSG("Invalid sampler mode={}", static_cast<int>(reduction)); ASSERT_MSG(false, "Invalid sampler mode={}", static_cast<int>(reduction));
return VK_SAMPLER_REDUCTION_MODE_WEIGHTED_AVERAGE_EXT; return VK_SAMPLER_REDUCTION_MODE_WEIGHTED_AVERAGE_EXT;
} }
@ -780,7 +780,7 @@ VkSampleCountFlagBits MsaaMode(Tegra::Texture::MsaaMode msaa_mode) {
case Tegra::Texture::MsaaMode::Msaa4x4: case Tegra::Texture::MsaaMode::Msaa4x4:
return VK_SAMPLE_COUNT_16_BIT; return VK_SAMPLE_COUNT_16_BIT;
default: default:
UNREACHABLE_MSG("Invalid msaa_mode={}", static_cast<int>(msaa_mode)); ASSERT_MSG(false, "Invalid msaa_mode={}", static_cast<int>(msaa_mode));
return VK_SAMPLE_COUNT_1_BIT; return VK_SAMPLE_COUNT_1_BIT;
} }
} }

View file

@ -46,7 +46,7 @@ size_t BytesPerIndex(VkIndexType index_type) {
case VK_INDEX_TYPE_UINT32: case VK_INDEX_TYPE_UINT32:
return 4; return 4;
default: default:
UNREACHABLE_MSG("Invalid index type={}", index_type); ASSERT_MSG(false, "Invalid index type={}", index_type);
return 1; return 1;
} }
} }
@ -366,7 +366,7 @@ void BufferCacheRuntime::ReserveQuadArrayLUT(u32 num_indices, bool wait_for_idle
std::memcpy(staging_data, MakeQuadIndices<u32>(quad, first).data(), quad_size); std::memcpy(staging_data, MakeQuadIndices<u32>(quad, first).data(), quad_size);
break; break;
default: default:
UNREACHABLE(); ASSERT(false);
break; break;
} }
staging_data += quad_size; staging_data += quad_size;

View file

@ -265,7 +265,7 @@ std::pair<VkBuffer, VkDeviceSize> QuadIndexedPass::Assemble(
case Tegra::Engines::Maxwell3D::Regs::IndexFormat::UnsignedInt: case Tegra::Engines::Maxwell3D::Regs::IndexFormat::UnsignedInt:
return 2; return 2;
} }
UNREACHABLE(); ASSERT(false);
return 2; return 2;
}(); }();
const u32 input_size = num_vertices << index_shift; const u32 input_size = num_vertices << index_shift;

View file

@ -174,7 +174,7 @@ Shader::RuntimeInfo MakeRuntimeInfo(std::span<const Shader::IR::Program> program
case Maxwell::TessellationPrimitive::Quads: case Maxwell::TessellationPrimitive::Quads:
return Shader::TessPrimitive::Quads; return Shader::TessPrimitive::Quads;
} }
UNREACHABLE(); ASSERT(false);
return Shader::TessPrimitive::Triangles; return Shader::TessPrimitive::Triangles;
}(); }();
info.tess_spacing = [&] { info.tess_spacing = [&] {
@ -187,7 +187,7 @@ Shader::RuntimeInfo MakeRuntimeInfo(std::span<const Shader::IR::Program> program
case Maxwell::TessellationSpacing::FractionalEven: case Maxwell::TessellationSpacing::FractionalEven:
return Shader::TessSpacing::FractionalEven; return Shader::TessSpacing::FractionalEven;
} }
UNREACHABLE(); ASSERT(false);
return Shader::TessSpacing::Equal; return Shader::TessSpacing::Equal;
}(); }();
break; break;

View file

@ -263,7 +263,7 @@ StagingBufferPool::StagingBuffersCache& StagingBufferPool::GetCache(MemoryUsage
case MemoryUsage::Download: case MemoryUsage::Download:
return download_cache; return download_cache;
default: default:
UNREACHABLE_MSG("Invalid memory usage={}", usage); ASSERT_MSG(false, "Invalid memory usage={}", usage);
return upload_cache; return upload_cache;
} }
} }

View file

@ -70,7 +70,7 @@ constexpr VkBorderColor ConvertBorderColor(const std::array<float, 4>& color) {
case ImageType::Buffer: case ImageType::Buffer:
break; break;
} }
UNREACHABLE_MSG("Invalid image type={}", type); ASSERT_MSG(false, "Invalid image type={}", type);
return {}; return {};
} }
@ -87,7 +87,7 @@ constexpr VkBorderColor ConvertBorderColor(const std::array<float, 4>& color) {
case 16: case 16:
return VK_SAMPLE_COUNT_16_BIT; return VK_SAMPLE_COUNT_16_BIT;
default: default:
UNREACHABLE_MSG("Invalid number of samples={}", num_samples); ASSERT_MSG(false, "Invalid number of samples={}", num_samples);
return VK_SAMPLE_COUNT_1_BIT; return VK_SAMPLE_COUNT_1_BIT;
} }
} }
@ -107,7 +107,7 @@ constexpr VkBorderColor ConvertBorderColor(const std::array<float, 4>& color) {
usage |= VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT; usage |= VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
break; break;
default: default:
UNREACHABLE_MSG("Invalid surface type"); ASSERT_MSG(false, "Invalid surface type");
} }
} }
if (info.storage) { if (info.storage) {
@ -179,7 +179,7 @@ constexpr VkBorderColor ConvertBorderColor(const std::array<float, 4>& color) {
case VideoCore::Surface::SurfaceType::DepthStencil: case VideoCore::Surface::SurfaceType::DepthStencil:
return VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT; return VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT;
default: default:
UNREACHABLE_MSG("Invalid surface type"); ASSERT_MSG(false, "Invalid surface type");
return VkImageAspectFlags{}; return VkImageAspectFlags{};
} }
} }
@ -221,7 +221,7 @@ constexpr VkBorderColor ConvertBorderColor(const std::array<float, 4>& color) {
case SwizzleSource::OneInt: case SwizzleSource::OneInt:
return VK_COMPONENT_SWIZZLE_ONE; return VK_COMPONENT_SWIZZLE_ONE;
} }
UNREACHABLE_MSG("Invalid swizzle={}", swizzle); ASSERT_MSG(false, "Invalid swizzle={}", swizzle);
return VK_COMPONENT_SWIZZLE_ZERO; return VK_COMPONENT_SWIZZLE_ZERO;
} }
@ -242,10 +242,10 @@ constexpr VkBorderColor ConvertBorderColor(const std::array<float, 4>& color) {
case Shader::TextureType::ColorArrayCube: case Shader::TextureType::ColorArrayCube:
return VK_IMAGE_VIEW_TYPE_CUBE_ARRAY; return VK_IMAGE_VIEW_TYPE_CUBE_ARRAY;
case Shader::TextureType::Buffer: case Shader::TextureType::Buffer:
UNREACHABLE_MSG("Texture buffers can't be image views"); ASSERT_MSG(false, "Texture buffers can't be image views");
return VK_IMAGE_VIEW_TYPE_1D; return VK_IMAGE_VIEW_TYPE_1D;
} }
UNREACHABLE_MSG("Invalid image view type={}", type); ASSERT_MSG(false, "Invalid image view type={}", type);
return VK_IMAGE_VIEW_TYPE_2D; return VK_IMAGE_VIEW_TYPE_2D;
} }
@ -269,10 +269,10 @@ constexpr VkBorderColor ConvertBorderColor(const std::array<float, 4>& color) {
UNIMPLEMENTED_MSG("Rect image view"); UNIMPLEMENTED_MSG("Rect image view");
return VK_IMAGE_VIEW_TYPE_2D; return VK_IMAGE_VIEW_TYPE_2D;
case VideoCommon::ImageViewType::Buffer: case VideoCommon::ImageViewType::Buffer:
UNREACHABLE_MSG("Texture buffers can't be image views"); ASSERT_MSG(false, "Texture buffers can't be image views");
return VK_IMAGE_VIEW_TYPE_1D; return VK_IMAGE_VIEW_TYPE_1D;
} }
UNREACHABLE_MSG("Invalid image view type={}", type); ASSERT_MSG(false, "Invalid image view type={}", type);
return VK_IMAGE_VIEW_TYPE_2D; return VK_IMAGE_VIEW_TYPE_2D;
} }
@ -644,7 +644,7 @@ struct RangedBarrierRange {
case Shader::ImageFormat::R32G32B32A32_UINT: case Shader::ImageFormat::R32G32B32A32_UINT:
return VK_FORMAT_R32G32B32A32_UINT; return VK_FORMAT_R32G32B32A32_UINT;
} }
UNREACHABLE_MSG("Invalid image format={}", format); ASSERT_MSG(false, "Invalid image format={}", format);
return VK_FORMAT_R32_UINT; return VK_FORMAT_R32_UINT;
} }
@ -1596,7 +1596,7 @@ ImageView::ImageView(TextureCacheRuntime& runtime, const VideoCommon::ImageViewI
UNIMPLEMENTED(); UNIMPLEMENTED();
break; break;
case VideoCommon::ImageViewType::Buffer: case VideoCommon::ImageViewType::Buffer:
UNREACHABLE(); ASSERT(false);
break; break;
} }
} }
@ -1822,7 +1822,7 @@ void TextureCacheRuntime::AccelerateImageUpload(
if (IsPixelFormatASTC(image.info.format)) { if (IsPixelFormatASTC(image.info.format)) {
return astc_decoder_pass.Assemble(image, map, swizzles); return astc_decoder_pass.Assemble(image, map, swizzles);
} }
UNREACHABLE(); ASSERT(false);
} }
} // namespace Vulkan } // namespace Vulkan

View file

@ -280,7 +280,7 @@ GraphicsEnvironment::GraphicsEnvironment(Tegra::Engines::Maxwell3D& maxwell3d_,
stage_index = 4; stage_index = 4;
break; break;
default: default:
UNREACHABLE_MSG("Invalid program={}", program); ASSERT_MSG(false, "Invalid program={}", program);
break; break;
} }
const u64 local_size{sph.LocalMemorySize()}; const u64 local_size{sph.LocalMemorySize()};

View file

@ -29,7 +29,7 @@ SurfaceTarget SurfaceTargetFromTextureType(Tegra::Texture::TextureType texture_t
return SurfaceTarget::Texture2DArray; return SurfaceTarget::Texture2DArray;
default: default:
LOG_CRITICAL(HW_GPU, "Unimplemented texture_type={}", texture_type); LOG_CRITICAL(HW_GPU, "Unimplemented texture_type={}", texture_type);
UNREACHABLE(); ASSERT(false);
return SurfaceTarget::Texture2D; return SurfaceTarget::Texture2D;
} }
} }
@ -48,7 +48,7 @@ bool SurfaceTargetIsLayered(SurfaceTarget target) {
return true; return true;
default: default:
LOG_CRITICAL(HW_GPU, "Unimplemented surface_target={}", target); LOG_CRITICAL(HW_GPU, "Unimplemented surface_target={}", target);
UNREACHABLE(); ASSERT(false);
return false; return false;
} }
} }
@ -67,7 +67,7 @@ bool SurfaceTargetIsArray(SurfaceTarget target) {
return true; return true;
default: default:
LOG_CRITICAL(HW_GPU, "Unimplemented surface_target={}", target); LOG_CRITICAL(HW_GPU, "Unimplemented surface_target={}", target);
UNREACHABLE(); ASSERT(false);
return false; return false;
} }
} }

View file

@ -94,7 +94,7 @@ ImageInfo::ImageInfo(const TICEntry& config) noexcept {
resources.layers = 1; resources.layers = 1;
break; break;
default: default:
UNREACHABLE_MSG("Invalid texture_type={}", static_cast<int>(config.texture_type.Value())); ASSERT_MSG(false, "Invalid texture_type={}", static_cast<int>(config.texture_type.Value()));
break; break;
} }
if (type != ImageType::Linear) { if (type != ImageType::Linear) {

View file

@ -71,7 +71,7 @@ ImageViewInfo::ImageViewInfo(const TICEntry& config, s32 base_layer) noexcept
range.extent.layers = config.Depth() * 6; range.extent.layers = config.Depth() * 6;
break; break;
default: default:
UNREACHABLE_MSG("Invalid texture_type={}", static_cast<int>(config.texture_type.Value())); ASSERT_MSG(false, "Invalid texture_type={}", static_cast<int>(config.texture_type.Value()));
break; break;
} }
} }

View file

@ -23,7 +23,7 @@ namespace VideoCommon {
case 16: case 16:
return {2, 2}; return {2, 2};
} }
UNREACHABLE_MSG("Invalid number of samples={}", num_samples); ASSERT_MSG(false, "Invalid number of samples={}", num_samples);
return {1, 1}; return {1, 1};
} }
@ -47,7 +47,7 @@ namespace VideoCommon {
case MsaaMode::Msaa4x4: case MsaaMode::Msaa4x4:
return 16; return 16;
} }
UNREACHABLE_MSG("Invalid MSAA mode={}", static_cast<int>(msaa_mode)); ASSERT_MSG(false, "Invalid MSAA mode={}", static_cast<int>(msaa_mode));
return 1; return 1;
} }

View file

@ -1485,14 +1485,14 @@ void TextureCache<P>::UnregisterImage(ImageId image_id) {
std::unordered_map<u64, std::vector<ImageId>, IdentityHash<u64>>& selected_page_table) { std::unordered_map<u64, std::vector<ImageId>, IdentityHash<u64>>& selected_page_table) {
const auto page_it = selected_page_table.find(page); const auto page_it = selected_page_table.find(page);
if (page_it == selected_page_table.end()) { if (page_it == selected_page_table.end()) {
UNREACHABLE_MSG("Unregistering unregistered page=0x{:x}", page << PAGE_BITS); ASSERT_MSG(false, "Unregistering unregistered page=0x{:x}", page << PAGE_BITS);
return; return;
} }
std::vector<ImageId>& image_ids = page_it->second; std::vector<ImageId>& image_ids = page_it->second;
const auto vector_it = std::ranges::find(image_ids, image_id); const auto vector_it = std::ranges::find(image_ids, image_id);
if (vector_it == image_ids.end()) { if (vector_it == image_ids.end()) {
UNREACHABLE_MSG("Unregistering unregistered image in page=0x{:x}", ASSERT_MSG(false, "Unregistering unregistered image in page=0x{:x}",
page << PAGE_BITS); page << PAGE_BITS);
return; return;
} }
image_ids.erase(vector_it); image_ids.erase(vector_it);
@ -1504,14 +1504,14 @@ void TextureCache<P>::UnregisterImage(ImageId image_id) {
ForEachCPUPage(image.cpu_addr, image.guest_size_bytes, [this, map_id](u64 page) { ForEachCPUPage(image.cpu_addr, image.guest_size_bytes, [this, map_id](u64 page) {
const auto page_it = page_table.find(page); const auto page_it = page_table.find(page);
if (page_it == page_table.end()) { if (page_it == page_table.end()) {
UNREACHABLE_MSG("Unregistering unregistered page=0x{:x}", page << PAGE_BITS); ASSERT_MSG(false, "Unregistering unregistered page=0x{:x}", page << PAGE_BITS);
return; return;
} }
std::vector<ImageMapId>& image_map_ids = page_it->second; std::vector<ImageMapId>& image_map_ids = page_it->second;
const auto vector_it = std::ranges::find(image_map_ids, map_id); const auto vector_it = std::ranges::find(image_map_ids, map_id);
if (vector_it == image_map_ids.end()) { if (vector_it == image_map_ids.end()) {
UNREACHABLE_MSG("Unregistering unregistered image in page=0x{:x}", ASSERT_MSG(false, "Unregistering unregistered image in page=0x{:x}",
page << PAGE_BITS); page << PAGE_BITS);
return; return;
} }
image_map_ids.erase(vector_it); image_map_ids.erase(vector_it);
@ -1532,7 +1532,7 @@ void TextureCache<P>::UnregisterImage(ImageId image_id) {
ForEachCPUPage(cpu_addr, size, [this, image_id](u64 page) { ForEachCPUPage(cpu_addr, size, [this, image_id](u64 page) {
const auto page_it = page_table.find(page); const auto page_it = page_table.find(page);
if (page_it == page_table.end()) { if (page_it == page_table.end()) {
UNREACHABLE_MSG("Unregistering unregistered page=0x{:x}", page << PAGE_BITS); ASSERT_MSG(false, "Unregistering unregistered page=0x{:x}", page << PAGE_BITS);
return; return;
} }
std::vector<ImageMapId>& image_map_ids = page_it->second; std::vector<ImageMapId>& image_map_ids = page_it->second;
@ -1616,15 +1616,15 @@ void TextureCache<P>::DeleteImage(ImageId image_id, bool immediate_delete) {
const GPUVAddr gpu_addr = image.gpu_addr; const GPUVAddr gpu_addr = image.gpu_addr;
const auto alloc_it = image_allocs_table.find(gpu_addr); const auto alloc_it = image_allocs_table.find(gpu_addr);
if (alloc_it == image_allocs_table.end()) { if (alloc_it == image_allocs_table.end()) {
UNREACHABLE_MSG("Trying to delete an image alloc that does not exist in address 0x{:x}", ASSERT_MSG(false, "Trying to delete an image alloc that does not exist in address 0x{:x}",
gpu_addr); gpu_addr);
return; return;
} }
const ImageAllocId alloc_id = alloc_it->second; const ImageAllocId alloc_id = alloc_it->second;
std::vector<ImageId>& alloc_images = slot_image_allocs[alloc_id].images; std::vector<ImageId>& alloc_images = slot_image_allocs[alloc_id].images;
const auto alloc_image_it = std::ranges::find(alloc_images, image_id); const auto alloc_image_it = std::ranges::find(alloc_images, image_id);
if (alloc_image_it == alloc_images.end()) { if (alloc_image_it == alloc_images.end()) {
UNREACHABLE_MSG("Trying to delete an image that does not exist"); ASSERT_MSG(false, "Trying to delete an image that does not exist");
return; return;
} }
ASSERT_MSG(False(image.flags & ImageFlagBits::Tracked), "Image was not untracked"); ASSERT_MSG(False(image.flags & ImageFlagBits::Tracked), "Image was not untracked");

View file

@ -87,7 +87,7 @@ void Swizzle(std::span<u8> output, std::span<const u8> input, u32 bytes_per_pixe
BPP_CASE(16) BPP_CASE(16)
#undef BPP_CASE #undef BPP_CASE
default: default:
UNREACHABLE_MSG("Invalid bytes_per_pixel={}", bytes_per_pixel); ASSERT_MSG(false, "Invalid bytes_per_pixel={}", bytes_per_pixel);
} }
} }
@ -209,7 +209,7 @@ void SwizzleSubrect(u32 subrect_width, u32 subrect_height, u32 source_pitch, u32
BPP_CASE(16) BPP_CASE(16)
#undef BPP_CASE #undef BPP_CASE
default: default:
UNREACHABLE_MSG("Invalid bytes_per_pixel={}", bytes_per_pixel); ASSERT_MSG(false, "Invalid bytes_per_pixel={}", bytes_per_pixel);
} }
} }
@ -230,7 +230,7 @@ void UnswizzleSubrect(u32 line_length_in, u32 line_count, u32 pitch, u32 width,
BPP_CASE(16) BPP_CASE(16)
#undef BPP_CASE #undef BPP_CASE
default: default:
UNREACHABLE_MSG("Invalid bytes_per_pixel={}", bytes_per_pixel); ASSERT_MSG(false, "Invalid bytes_per_pixel={}", bytes_per_pixel);
} }
} }
@ -253,7 +253,7 @@ void SwizzleSliceToVoxel(u32 line_length_in, u32 line_count, u32 pitch, u32 widt
BPP_CASE(16) BPP_CASE(16)
#undef BPP_CASE #undef BPP_CASE
default: default:
UNREACHABLE_MSG("Invalid bytes_per_pixel={}", bytes_per_pixel); ASSERT_MSG(false, "Invalid bytes_per_pixel={}", bytes_per_pixel);
} }
} }

View file

@ -738,9 +738,10 @@ VkFormat Device::GetSupportedFormat(VkFormat wanted_format, VkFormatFeatureFlags
// The wanted format is not supported by hardware, search for alternatives // The wanted format is not supported by hardware, search for alternatives
const VkFormat* alternatives = GetFormatAlternatives(wanted_format); const VkFormat* alternatives = GetFormatAlternatives(wanted_format);
if (alternatives == nullptr) { if (alternatives == nullptr) {
UNREACHABLE_MSG("Format={} with usage={} and type={} has no defined alternatives and host " ASSERT_MSG(false,
"hardware does not support it", "Format={} with usage={} and type={} has no defined alternatives and host "
wanted_format, wanted_usage, format_type); "hardware does not support it",
wanted_format, wanted_usage, format_type);
return wanted_format; return wanted_format;
} }
@ -756,9 +757,10 @@ VkFormat Device::GetSupportedFormat(VkFormat wanted_format, VkFormatFeatureFlags
} }
// No alternatives found, panic // No alternatives found, panic
UNREACHABLE_MSG("Format={} with usage={} and type={} is not supported by the host hardware and " ASSERT_MSG(false,
"doesn't support any of the alternatives", "Format={} with usage={} and type={} is not supported by the host hardware and "
wanted_format, wanted_usage, format_type); "doesn't support any of the alternatives",
wanted_format, wanted_usage, format_type);
return wanted_format; return wanted_format;
} }

View file

@ -49,7 +49,7 @@ struct Range {
return VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT | return VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT |
VK_MEMORY_PROPERTY_HOST_CACHED_BIT; VK_MEMORY_PROPERTY_HOST_CACHED_BIT;
} }
UNREACHABLE_MSG("Invalid memory usage={}", usage); ASSERT_MSG(false, "Invalid memory usage={}", usage);
return VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; return VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
} }
@ -325,7 +325,7 @@ VkMemoryPropertyFlags MemoryAllocator::MemoryPropertyFlags(u32 type_mask,
// Remove device local, if it's not supported by the requested resource // Remove device local, if it's not supported by the requested resource
return MemoryPropertyFlags(type_mask, flags & ~VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT); return MemoryPropertyFlags(type_mask, flags & ~VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
} }
UNREACHABLE_MSG("No compatible memory types found"); ASSERT_MSG(false, "No compatible memory types found");
return 0; return 0;
} }
@ -349,7 +349,7 @@ bool IsHostVisible(MemoryUsage usage) noexcept {
case MemoryUsage::Download: case MemoryUsage::Download:
return true; return true;
} }
UNREACHABLE_MSG("Invalid memory usage={}", usage); ASSERT_MSG(false, "Invalid memory usage={}", usage);
return false; return false;
} }

View file

@ -631,7 +631,7 @@ void QtControllerSelectorDialog::DisableUnsupportedPlayers() {
switch (max_supported_players) { switch (max_supported_players) {
case 0: case 0:
default: default:
UNREACHABLE(); ASSERT(false);
return; return;
case 1: case 1:
ui->widgetSpacer->hide(); ui->widgetSpacer->hide();