From 9ed03c406bba6bd5d767df2cad57baef84f0c39d Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Mon, 8 Jul 2024 18:28:56 -0700 Subject: [PATCH] Add I32 for B-Format buffer formats to AL_EXT_32bit_formats --- al/buffer.cpp | 2 ++ alc/export_list.h | 2 ++ alc/inprogext.h | 13 ++++++++----- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/al/buffer.cpp b/al/buffer.cpp index 4812e415..781fff1e 100644 --- a/al/buffer.cpp +++ b/al/buffer.cpp @@ -616,11 +616,13 @@ auto DecomposeUserFormat(ALenum format) noexcept -> std::optional FormatMap{AL_FORMAT_BFORMAT2D_8, {FmtBFormat2D, FmtUByte}}, FormatMap{AL_FORMAT_BFORMAT2D_16, {FmtBFormat2D, FmtShort}}, + FormatMap{AL_FORMAT_BFORMAT2D_I32, {FmtBFormat2D, FmtInt} }, FormatMap{AL_FORMAT_BFORMAT2D_FLOAT32, {FmtBFormat2D, FmtFloat}}, FormatMap{AL_FORMAT_BFORMAT2D_MULAW, {FmtBFormat2D, FmtMulaw}}, FormatMap{AL_FORMAT_BFORMAT3D_8, {FmtBFormat3D, FmtUByte}}, FormatMap{AL_FORMAT_BFORMAT3D_16, {FmtBFormat3D, FmtShort}}, + FormatMap{AL_FORMAT_BFORMAT2D_I32, {FmtBFormat3D, FmtInt} }, FormatMap{AL_FORMAT_BFORMAT3D_FLOAT32, {FmtBFormat3D, FmtFloat}}, FormatMap{AL_FORMAT_BFORMAT3D_MULAW, {FmtBFormat3D, FmtMulaw}}, diff --git a/alc/export_list.h b/alc/export_list.h index 2c291ac0..f40b8f71 100644 --- a/alc/export_list.h +++ b/alc/export_list.h @@ -627,6 +627,8 @@ inline const EnumExport alcEnumerations[]{ DECL(AL_FORMAT_51CHN_I32), DECL(AL_FORMAT_61CHN_I32), DECL(AL_FORMAT_71CHN_I32), + DECL(AL_FORMAT_BFORMAT2D_I32), + DECL(AL_FORMAT_BFORMAT3D_I32), DECL(AL_FORMAT_UHJ2CHN_I32_SOFT), DECL(AL_FORMAT_UHJ3CHN_I32_SOFT), DECL(AL_FORMAT_UHJ4CHN_I32_SOFT), diff --git a/alc/inprogext.h b/alc/inprogext.h index eaf547b7..f847b340 100644 --- a/alc/inprogext.h +++ b/alc/inprogext.h @@ -70,15 +70,18 @@ void AL_APIENTRY alFlushMappedBufferDirectSOFT(ALCcontext *context, ALuint buffe #define AL_FORMAT_71CHN_I32 0x19E5 #define AL_FORMAT_71CHN_FLOAT32 0x19E6 -#define AL_FORMAT_UHJ2CHN_I32_SOFT 0x19E7 -#define AL_FORMAT_UHJ3CHN_I32_SOFT 0x19E8 -#define AL_FORMAT_UHJ4CHN_I32_SOFT 0x19E9 +#define AL_FORMAT_BFORMAT2D_I32 0x19E7 +#define AL_FORMAT_BFORMAT3D_I32 0x19E8 + +#define AL_FORMAT_UHJ2CHN_I32_SOFT 0x19E9 +#define AL_FORMAT_UHJ3CHN_I32_SOFT 0x19EA +#define AL_FORMAT_UHJ4CHN_I32_SOFT 0x19EB #endif #ifndef AL_SOFT_source_panning #define AL_SOFT_source_panning -#define AL_PANNING_ENABLED_SOFT 0x19EA -#define AL_PAN_SOFT 0x19EB +#define AL_PANNING_ENABLED_SOFT 0x19EC +#define AL_PAN_SOFT 0x19ED #endif /* Non-standard exports. Not part of any extension. */ -- 2.11.4.GIT