GerbilSoft/rom-properties
1
Fork 0
mirror of https://github.com/GerbilSoft/rom-properties.git synced 2025-06-18 19:45:41 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Multi-line constexpr functions are only supported as of MSVC 2022.
Some checks are pending
Codecov / run (push) Waiting to run
Details
CodeQL / Analyze (cpp) (push) Waiting to run
Details

Browse Source 
New macros:
- CONSTEXPR_IF_MSVC2022: constexpr for MSVC 2022 and later (also gcc).
- CONSTEXPR_NO_MSVC: no constexpr on any MSVC (but yes on gcc).

Use CONSTEXPR_IF_MSVC2022 on multi-line constexpr functions.

Use CONSTEXPR_NO_MSVC on functions that can be constexpr on gcc but
not any version of MSVC.
This commit is contained in:
David Korth 2025-05-11 00:58:11 -04:00
parent 53b74e0467
commit 03df42456c
7 changed files with 48 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/compiler-compat.h
View File

@ -75,3 +75,17 @@ typedef int64_t off64_t;
#ifdef _WIN32
# include "c99-compat.msvcrt.h"
#endif
// Some MSVC intrinsics aren't constexpr.
#ifdef _MSC_VER
# define CONSTEXPR_NO_MSVC
#else /* !_MSC_VER */
# define CONSTEXPR_NO_MSVC constexpr
#endif
// MSVC prior to MSVC 2022 does not support constexpr on multi-line functions.
#if !defined(__cplusplus) || (defined(_MSC_VER) && _MSC_VER < 1930)
# define CONSTEXPR_IF_MSVC2022
#else
# define CONSTEXPR_IF_MSVC2022 constexpr
#endif

6
src/libromdata/Console/GameCubeSave.cpp
View File

@ -72,11 +72,7 @@ public:
* @return PDP-swapped DWORD
*/
// FIXME: be32_to_cpu() and __swab16() are not constexpr on MSVC 2022.
#ifndef _MSC_VER
static inline constexpr uint32_t PDP_SWAP(uint32_t x)
#else /* !_MSC_VER */
static inline uint32_t PDP_SWAP(uint32_t x)
#endif /* _MSC_VER */
static inline CONSTEXPR_NO_MSVC uint32_t PDP_SWAP(uint32_t x)
{
union {
uint32_t d;

4
src/librptext/formatting.cpp
View File

@ -50,7 +50,7 @@ static char lc_decimal[8];
/** File size formatting **/
template<typename T>
static inline constexpr int calc_frac_part_binary(T val, T mask)
static inline CONSTEXPR_IF_MSVC2022 int calc_frac_part_binary(T val, T mask)
{
const float f = static_cast<float>(val & (mask - 1)) / static_cast<float>(mask);
int frac_part = static_cast<int>(f * 1000.0f);
@ -70,7 +70,7 @@ static inline constexpr int calc_frac_part_binary(T val, T mask)
}
template<typename T>
static inline constexpr int calc_frac_part_decimal(T val, T divisor)
static inline CONSTEXPR_IF_MSVC2022 int calc_frac_part_decimal(T val, T divisor)
{
const float f = static_cast<float>(val % divisor) / static_cast<float>(divisor);
int frac_part = static_cast<int>(f * 1000.0f);

8
src/librptexture/decoder/ImageDecoder_DC.hpp
View File

@ -2,7 +2,7 @@
* ROM Properties Page shell extension. (librptexture) *
* ImageDecoder_DC.hpp: Image decoding functions: Dreamcast *
* *
* Copyright (c) 2016-2023 by David Korth. *
* Copyright (c) 2016-2025 by David Korth. *
* SPDX-License-Identifier: GPL-2.0-or-later *
***************************************************************************/
@ -48,11 +48,10 @@ rp_image_ptr fromDreamcastVQ16(PixelFormat px_format,
/**
* Get the number of palette entries for Dreamcast SmallVQ textures.
* This version is for textures without mipmaps.
* TODO: constexpr?
* @param width Texture width.
* @return Number of palette entries.
*/
static inline constexpr int calcDreamcastSmallVQPaletteEntries_NoMipmaps(int width)
static inline CONSTEXPR_IF_MSVC2022 int calcDreamcastSmallVQPaletteEntries_NoMipmaps(int width)
{
if (width <= 16) {
return 8*4;
@ -68,11 +67,10 @@ static inline constexpr int calcDreamcastSmallVQPaletteEntries_NoMipmaps(int wid
/**
* Get the number of palette entries for Dreamcast SmallVQ textures.
* This version is for textures with mipmaps.
* TODO: constexpr?
* @param width Texture width.
* @return Number of palette entries.
*/
static inline constexpr int calcDreamcastSmallVQPaletteEntries_WithMipmaps(int width)
static inline CONSTEXPR_IF_MSVC2022 int calcDreamcastSmallVQPaletteEntries_WithMipmaps(int width)
{
if (width <= 16) {
return 16*4;

2
src/librptexture/decoder/ImageDecoder_ETC1.cpp
View File

@ -285,7 +285,7 @@ struct ColorRGB {
* @param color ColorRGB struct.
* @return xRGB32 value. (Alpha channel set to 0xFF)
*/
static inline constexpr uint32_t clamp_ColorRGB(ColorRGB color)
static inline CONSTEXPR_IF_MSVC2022 uint32_t clamp_ColorRGB(ColorRGB color)
{
uint32_t xrgb32 = 0;
if (color.B > 255) {

54
src/librptexture/decoder/PixelConversion.hpp
View File

@ -62,7 +62,7 @@ static constexpr std::array<uint8_t, 8> c3_lookup = {{
* @param px16 RGB565 pixel
* @return ARGB32 pixel
*/
static inline constexpr uint32_t RGB565_to_ARGB32(uint16_t px16)
static inline CONSTEXPR_IF_MSVC2022 uint32_t RGB565_to_ARGB32(uint16_t px16)
{
// RGB565: RRRRRGGG GGGBBBBB
// ARGB32: AAAAAAAA RRRRRRRR GGGGGGGG BBBBBBBB
@ -80,7 +80,7 @@ static inline constexpr uint32_t RGB565_to_ARGB32(uint16_t px16)
* @param px16 BGR565 pixel
* @return ARGB32 pixel
*/
static inline constexpr uint32_t BGR565_to_ARGB32(uint16_t px16)
static inline CONSTEXPR_IF_MSVC2022 uint32_t BGR565_to_ARGB32(uint16_t px16)
{
// RGB565: BBBBBGGG GGGRRRRR
// ARGB32: AAAAAAAA RRRRRRRR GGGGGGGG BBBBBBBB
@ -98,7 +98,7 @@ static inline constexpr uint32_t BGR565_to_ARGB32(uint16_t px16)
* @param px16 ARGB1555 pixel
* @return ARGB32 pixel
*/
static inline constexpr uint32_t ARGB1555_to_ARGB32(uint16_t px16)
static inline CONSTEXPR_IF_MSVC2022 uint32_t ARGB1555_to_ARGB32(uint16_t px16)
{
// ARGB1555: ARRRRRGG GGGBBBBB
// ARGB32: AAAAAAAA RRRRRRRR GGGGGGGG BBBBBBBB
@ -118,7 +118,7 @@ static inline constexpr uint32_t ARGB1555_to_ARGB32(uint16_t px16)
* @param px16 ABGR1555 pixel
* @return ARGB32 pixel
*/
static inline constexpr uint32_t ABGR1555_to_ARGB32(uint16_t px16)
static inline CONSTEXPR_IF_MSVC2022 uint32_t ABGR1555_to_ARGB32(uint16_t px16)
{
// ABGR1555: ABBBBBGG GGGRRRRR
// ARGB32: AAAAAAAA RRRRRRRR GGGGGGGG BBBBBBBB
@ -138,7 +138,7 @@ static inline constexpr uint32_t ABGR1555_to_ARGB32(uint16_t px16)
* @param px16 RGBA5551 pixel
* @return ARGB32 pixel
*/
static inline constexpr uint32_t RGBA5551_to_ARGB32(uint16_t px16)
static inline CONSTEXPR_IF_MSVC2022 uint32_t RGBA5551_to_ARGB32(uint16_t px16)
{
// RGBA5551: RRRRRGGG GGBBBBBA
// ARGB32: AAAAAAAA RRRRRRRR GGGGGGGG BBBBBBBB
@ -158,7 +158,7 @@ static inline constexpr uint32_t RGBA5551_to_ARGB32(uint16_t px16)
* @param px16 BGRA5551 pixel
* @return ARGB32 pixel
*/
static inline constexpr uint32_t BGRA5551_to_ARGB32(uint16_t px16)
static inline CONSTEXPR_IF_MSVC2022 uint32_t BGRA5551_to_ARGB32(uint16_t px16)
{
// BGRA5551: BBBBBGGG GGRRRRRA
// ARGB32: AAAAAAAA RRRRRRRR GGGGGGGG BBBBBBBB
@ -178,7 +178,7 @@ static inline constexpr uint32_t BGRA5551_to_ARGB32(uint16_t px16)
* @param px16 ARGB4444 pixel
* @return ARGB32 pixel
*/
static inline constexpr uint32_t ARGB4444_to_ARGB32(uint16_t px16)
static inline CONSTEXPR_IF_MSVC2022 uint32_t ARGB4444_to_ARGB32(uint16_t px16)
{
// ARGB4444: AAAARRRR GGGGBBBB
// ARGB32: AAAAAAAA RRRRRRRR GGGGGGGG BBBBBBBB
@ -195,7 +195,7 @@ static inline constexpr uint32_t ARGB4444_to_ARGB32(uint16_t px16)
* @param px16 ABGR4444 pixel
* @return ARGB32 pixel
*/
static inline constexpr uint32_t ABGR4444_to_ARGB32(uint16_t px16)
static inline CONSTEXPR_IF_MSVC2022 uint32_t ABGR4444_to_ARGB32(uint16_t px16)
{
// ARGB4444: AAAABBBB GGGGRRRR
// ARGB32: AAAAAAAA RRRRRRRR GGGGGGGG BBBBBBBB
@ -212,7 +212,7 @@ static inline constexpr uint32_t ABGR4444_to_ARGB32(uint16_t px16)
* @param px16 RGBA4444 pixel
* @return ARGB32 pixel
*/
static inline constexpr uint32_t RGBA4444_to_ARGB32(uint16_t px16)
static inline CONSTEXPR_IF_MSVC2022 uint32_t RGBA4444_to_ARGB32(uint16_t px16)
{
// RGBA4444: RRRRGGGG BBBBAAAA
// ARGB32: AAAAAAAA RRRRRRRR GGGGGGGG BBBBBBBB
@ -229,7 +229,7 @@ static inline constexpr uint32_t RGBA4444_to_ARGB32(uint16_t px16)
* @param px16 BGRA4444 pixel
* @return ARGB32 pixel
*/
static inline constexpr uint32_t BGRA4444_to_ARGB32(uint16_t px16)
static inline CONSTEXPR_IF_MSVC2022 uint32_t BGRA4444_to_ARGB32(uint16_t px16)
{
// RGBA4444: BBBBGGGG RRRRAAAA
// ARGB32: AAAAAAAA RRRRRRRR GGGGGGGG BBBBBBBB
@ -246,7 +246,7 @@ static inline constexpr uint32_t BGRA4444_to_ARGB32(uint16_t px16)
* @param px16 xRGB4444 pixel
* @return ARGB32 pixel
*/
static inline constexpr uint32_t xRGB4444_to_ARGB32(uint16_t px16)
static inline CONSTEXPR_IF_MSVC2022 uint32_t xRGB4444_to_ARGB32(uint16_t px16)
{
// xRGB4444: xxxxRRRR GGGGBBBB
// ARGB32: AAAAAAAA RRRRRRRR GGGGGGGG BBBBBBBB
@ -263,7 +263,7 @@ static inline constexpr uint32_t xRGB4444_to_ARGB32(uint16_t px16)
* @param px16 xBGR4444 pixel
* @return ARGB32 pixel
*/
static inline constexpr uint32_t xBGR4444_to_ARGB32(uint16_t px16)
static inline CONSTEXPR_IF_MSVC2022 uint32_t xBGR4444_to_ARGB32(uint16_t px16)
{
// xRGB4444: xxxxBBBB GGGGRRRR
// ARGB32: AAAAAAAA RRRRRRRR GGGGGGGG BBBBBBBB
@ -280,7 +280,7 @@ static inline constexpr uint32_t xBGR4444_to_ARGB32(uint16_t px16)
* @param px16 RGBx4444 pixel
* @return ARGB32 pixel
*/
static inline constexpr uint32_t RGBx4444_to_ARGB32(uint16_t px16)
static inline CONSTEXPR_IF_MSVC2022 uint32_t RGBx4444_to_ARGB32(uint16_t px16)
{
// RGBx4444: RRRRGGGG BBBBxxxx
// ARGB32: AAAAAAAA RRRRRRRR GGGGGGGG BBBBBBBB
@ -297,7 +297,7 @@ static inline constexpr uint32_t RGBx4444_to_ARGB32(uint16_t px16)
* @param px16 BGRx4444 pixel
* @return ARGB32 pixel
*/
static inline constexpr uint32_t BGRx4444_to_ARGB32(uint16_t px16)
static inline CONSTEXPR_IF_MSVC2022 uint32_t BGRx4444_to_ARGB32(uint16_t px16)
{
// RGBx4444: BBBBGGGG RRRRxxxx
// ARGB32: AAAAAAAA RRRRRRRR GGGGGGGG BBBBBBBB
@ -342,11 +342,7 @@ static inline constexpr uint32_t RG88_to_ARGB32(uint16_t px16)
* @return ARGB32 pixel
*/
// FIXME: __swab16() is not constexpr on MSVC 2022.
#ifndef _MSC_VER
static inline constexpr uint32_t GR88_to_ARGB32(uint16_t px16)
#else /* _MSC_VER */
static inline uint32_t GR88_to_ARGB32(uint16_t px16)
#endif /* !_MSC_VER */
static inline CONSTEXPR_NO_MSVC uint32_t GR88_to_ARGB32(uint16_t px16)
{
// GR88: GGGGGGGG RRRRRRRR
// ARGB32: AAAAAAAA RRRRRRRR GGGGGGGG BBBBBBBB
@ -360,7 +356,7 @@ static inline uint32_t GR88_to_ARGB32(uint16_t px16)
* @param px16 RGB5A3 pixel (Must be host-endian.)
* @return ARGB32 pixel
*/
static inline constexpr uint32_t RGB5A3_to_ARGB32(uint16_t px16)
static inline CONSTEXPR_IF_MSVC2022 uint32_t RGB5A3_to_ARGB32(uint16_t px16)
{
// px16 high bit: if set, no alpha channel
uint32_t px32 = (px16 & 0x8000U)
@ -395,7 +391,7 @@ static inline constexpr uint32_t RGB5A3_to_ARGB32(uint16_t px16)
* @param px16 IA8 pixel
* @return ARGB32 pixel
*/
static inline constexpr uint32_t IA8_to_ARGB32(uint16_t px16)
static inline CONSTEXPR_IF_MSVC2022 uint32_t IA8_to_ARGB32(uint16_t px16)
{
// FIXME: What's the component order of IA8?
// Assuming I=MSB, A=LSB...
@ -417,7 +413,7 @@ static inline constexpr uint32_t IA8_to_ARGB32(uint16_t px16)
* @param a4 A4 value
* @return ARGB32 pixel
*/
static inline constexpr uint32_t RGB565_A4_to_ARGB32(uint16_t px16, uint8_t a4)
static inline CONSTEXPR_IF_MSVC2022 uint32_t RGB565_A4_to_ARGB32(uint16_t px16, uint8_t a4)
{
// RGB565: RRRRRGGG GGGBBBBB
// ARGB32: AAAAAAAA RRRRRRRR GGGGGGGG BBBBBBBB
@ -439,7 +435,7 @@ static inline constexpr uint32_t RGB565_A4_to_ARGB32(uint16_t px16, uint8_t a4)
* @param px16 BGR5A3 pixel (Must be host-endian.)
* @return ARGB32 pixel
*/
static inline constexpr uint32_t BGR5A3_to_ARGB32(uint16_t px16)
static inline CONSTEXPR_IF_MSVC2022 uint32_t BGR5A3_to_ARGB32(uint16_t px16)
{
// px16 high bit: if set, no alpha channel
uint32_t px32 = (px16 & 0x8000U)
@ -476,7 +472,7 @@ static inline constexpr uint32_t BGR5A3_to_ARGB32(uint16_t px16)
* @param px16 RGB555 pixel
* @return ARGB32 pixel
*/
static inline constexpr uint32_t RGB555_to_ARGB32(uint16_t px16)
static inline CONSTEXPR_IF_MSVC2022 uint32_t RGB555_to_ARGB32(uint16_t px16)
{
// RGB555: xRRRRRGG GGGBBBBB
// ARGB32: AAAAAAAA RRRRRRRR GGGGGGGG BBBBBBBB
@ -493,7 +489,7 @@ static inline constexpr uint32_t RGB555_to_ARGB32(uint16_t px16)
* @param px16 BGR555 pixel
* @return ARGB32 pixel
*/
static inline constexpr uint32_t BGR555_to_ARGB32(uint16_t px16)
static inline CONSTEXPR_IF_MSVC2022 uint32_t BGR555_to_ARGB32(uint16_t px16)
{
// BGR555: xBBBBBGG GGGRRRRR
// ARGB32: AAAAAAAA RRRRRRRR GGGGGGGG BBBBBBBB
@ -607,7 +603,7 @@ static inline uint32_t RGB9_E5_to_ARGB32(uint32_t px32)
* @param px16 BGR888_ABGR7888 pixel (Must be host-endian.)
* @return ARGB32 pixel
*/
static inline constexpr uint32_t BGR888_ABGR7888_to_ARGB32(uint32_t px32)
static inline CONSTEXPR_IF_MSVC2022 uint32_t BGR888_ABGR7888_to_ARGB32(uint32_t px32)
{
// px32 high bit: if set, no alpha channel
uint32_t argb = (px32 & 0x80000000U)
@ -655,7 +651,7 @@ static inline constexpr uint32_t L8_to_ARGB32(uint8_t px8)
* @param px8 A4L4 pixel
* @return ARGB32 pixel
*/
static inline constexpr uint32_t A4L4_to_ARGB32(uint8_t px8)
static inline CONSTEXPR_IF_MSVC2022 uint32_t A4L4_to_ARGB32(uint8_t px8)
{
// A4L4: AAAALLLL
// ARGB32: AAAAAAAA RRRRRRRR GGGGGGGG BBBBBBBB
@ -685,7 +681,7 @@ static inline constexpr uint32_t L16_to_ARGB32(uint16_t px16)
* @param px16 A8L8 pixel
* @return ARGB32 pixel
*/
static inline constexpr uint32_t A8L8_to_ARGB32(uint16_t px16)
static inline CONSTEXPR_IF_MSVC2022 uint32_t A8L8_to_ARGB32(uint16_t px16)
{
// A8L8: AAAAAAAA LLLLLLLL
// ARGB32: AAAAAAAA RRRRRRRR GGGGGGGG BBBBBBBB
@ -701,7 +697,7 @@ static inline constexpr uint32_t A8L8_to_ARGB32(uint16_t px16)
* @param px16 L8A8 pixel
* @return ARGB32 pixel
*/
static inline constexpr uint32_t L8A8_to_ARGB32(uint16_t px16)
static inline CONSTEXPR_IF_MSVC2022 uint32_t L8A8_to_ARGB32(uint16_t px16)
{
// FIXME: What's the component order of IA8?
// Assuming I=MSB, A=LSB...

4
src/librptexture/fileformat/XboxXPR.cpp
View File

@ -99,7 +99,7 @@ class XboxXPRPrivate final : public FileFormatPrivate
* @param value
* @return
*/
static constexpr uint32_t fill_pattern(uint32_t pattern, uint32_t value)
static CONSTEXPR_IF_MSVC2022 uint32_t fill_pattern(uint32_t pattern, uint32_t value)
{
uint32_t result = 0;
uint32_t bit = 1;
@ -130,7 +130,7 @@ class XboxXPRPrivate final : public FileFormatPrivate
* @param bytes_per_pixel
* @return
*/
static inline constexpr unsigned int get_swizzled_offset(
static inline CONSTEXPR_IF_MSVC2022 unsigned int get_swizzled_offset(
unsigned int x, unsigned int y,
uint32_t mask_x, uint32_t mask_y,
unsigned int bytes_per_pixel)