From 996f1546b26b6137ff62474051c53406b9932208 Mon Sep 17 00:00:00 2001 From: Marshall Mohror Date: Thu, 20 Feb 2020 13:40:21 -0600 Subject: [PATCH] core: Remove outdated MSVC workarounds (#5099) * core/hw/gpu: Remove outdated MSVC workarounds * core/hle/service/hid: Remove MSVC workaround --- src/core/hle/service/hid/hid.h | 7 ------- src/core/hw/gpu.cpp | 4 ++-- src/core/hw/gpu.h | 31 ------------------------------- 3 files changed, 2 insertions(+), 40 deletions(-) diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h index 8d217f8356..7e8a8c5278 100644 --- a/src/core/hle/service/hid/hid.h +++ b/src/core/hle/service/hid/hid.h @@ -6,9 +6,7 @@ #include #include -#ifndef _MSC_VER #include -#endif #include #include "common/bit_field.h" #include "common/common_funcs.h" @@ -177,10 +175,6 @@ struct GyroscopeCalibrateParam { } x, y, z; }; -// TODO: MSVC does not support using offsetof() on non-static data members even though this -// is technically allowed since C++11. This macro should be enabled once MSVC adds -// support for that. -#ifndef _MSC_VER #define ASSERT_REG_POSITION(field_name, position) \ static_assert(offsetof(SharedMem, field_name) == position * 4, \ "Field " #field_name " has invalid position") @@ -189,7 +183,6 @@ ASSERT_REG_POSITION(pad.index_reset_ticks, 0x0); ASSERT_REG_POSITION(touch.index_reset_ticks, 0x2A); #undef ASSERT_REG_POSITION -#endif // !defined(_MSC_VER) struct DirectionState { bool up; diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp index fcb60e6fec..f641afae46 100644 --- a/src/core/hw/gpu.cpp +++ b/src/core/hw/gpu.cpp @@ -402,8 +402,8 @@ inline void Write(u32 addr, const T data) { switch (index) { // Memory fills are triggered once the fill value is written. - case GPU_REG_INDEX_WORKAROUND(memory_fill_config[0].trigger, 0x00004 + 0x3): - case GPU_REG_INDEX_WORKAROUND(memory_fill_config[1].trigger, 0x00008 + 0x3): { + case GPU_REG_INDEX(memory_fill_config[0].trigger): + case GPU_REG_INDEX(memory_fill_config[1].trigger): { const bool is_second_filler = (index != GPU_REG_INDEX(memory_fill_config[0].trigger)); auto& config = g_regs.memory_fill_config[is_second_filler]; diff --git a/src/core/hw/gpu.h b/src/core/hw/gpu.h index 606ab95040..ac30bc22ee 100644 --- a/src/core/hw/gpu.h +++ b/src/core/hw/gpu.h @@ -20,41 +20,15 @@ namespace GPU { constexpr float SCREEN_REFRESH_RATE = 60; // Returns index corresponding to the Regs member labeled by field_name -// TODO: Due to Visual studio bug 209229, offsetof does not return constant expressions -// when used with array elements (e.g. GPU_REG_INDEX(memory_fill_config[0])). -// For details cf. -// https://connect.microsoft.com/VisualStudio/feedback/details/209229/offsetof-does-not-produce-a-constant-expression-for-array-members -// Hopefully, this will be fixed sometime in the future. -// For lack of better alternatives, we currently hardcode the offsets when constant -// expressions are needed via GPU_REG_INDEX_WORKAROUND (on sane compilers, static_asserts -// will then make sure the offsets indeed match the automatically calculated ones). #define GPU_REG_INDEX(field_name) (offsetof(GPU::Regs, field_name) / sizeof(u32)) -#if defined(_MSC_VER) -#define GPU_REG_INDEX_WORKAROUND(field_name, backup_workaround_index) (backup_workaround_index) -#else -// NOTE: Yeah, hacking in a static_assert here just to workaround the lacking MSVC compiler -// really is this annoying. This macro just forwards its first argument to GPU_REG_INDEX -// and then performs a (no-op) cast to std::size_t iff the second argument matches the -// expected field offset. Otherwise, the compiler will fail to compile this code. -#define GPU_REG_INDEX_WORKAROUND(field_name, backup_workaround_index) \ - ((typename std::enable_if::type) GPU_REG_INDEX(field_name)) -#endif // MMIO region 0x1EFxxxxx struct Regs { // helper macro to make sure the defined structures are of the expected size. -#if defined(_MSC_VER) -// TODO: MSVC does not support using sizeof() on non-static data members even though this -// is technically allowed since C++11. This macro should be enabled once MSVC adds -// support for that. -#define ASSERT_MEMBER_SIZE(name, size_in_bytes) -#else #define ASSERT_MEMBER_SIZE(name, size_in_bytes) \ static_assert(sizeof(name) == size_in_bytes, \ "Structure size and register block length don't match") -#endif // Components are laid out in reverse byte order, most significant bits first. enum class PixelFormat : u32 { @@ -299,10 +273,6 @@ private: }; static_assert(std::is_standard_layout::value, "Structure does not use standard layout"); -// TODO: MSVC does not support using offsetof() on non-static data members even though this -// is technically allowed since C++11. This macro should be enabled once MSVC adds -// support for that. -#ifndef _MSC_VER #define ASSERT_REG_POSITION(field_name, position) \ static_assert(offsetof(Regs, field_name) == position * 4, \ "Field " #field_name " has invalid position") @@ -315,7 +285,6 @@ ASSERT_REG_POSITION(display_transfer_config, 0x00300); ASSERT_REG_POSITION(command_processor_config, 0x00638); #undef ASSERT_REG_POSITION -#endif // !defined(_MSC_VER) // The total number of registers is chosen arbitrarily, but let's make sure it's not some odd value // anyway.