aboutsummaryrefslogtreecommitdiffstats
path: root/alc/inprogext.h
diff options
context:
space:
mode:
authorSven Göthel <[email protected]>2024-01-05 13:52:12 +0100
committerSven Göthel <[email protected]>2024-01-05 13:52:12 +0100
commitec98cdacc85ff0202852472c7756586437912f22 (patch)
tree42414746a27ab35cb8cdbc95af521d74821e57f4 /alc/inprogext.h
parentfd5269bec9a5fe4815974b1786a037e6a247bfd2 (diff)
parentb82cd2e60edb8fbe5fdd3567105ae76a016a554c (diff)
Merge remote-tracking branch 'upstream/master'HEADmaster
Diffstat (limited to 'alc/inprogext.h')
-rw-r--r--alc/inprogext.h32
1 files changed, 17 insertions, 15 deletions
diff --git a/alc/inprogext.h b/alc/inprogext.h
index c5b09f13..a150af86 100644
--- a/alc/inprogext.h
+++ b/alc/inprogext.h
@@ -1,6 +1,7 @@
#ifndef INPROGEXT_H
#define INPROGEXT_H
+/* NOLINTBEGIN */
#include "AL/al.h"
#include "AL/alc.h"
#include "AL/alext.h"
@@ -398,24 +399,24 @@ ALenum AL_APIENTRY EAXGetBufferModeDirect(ALCcontext *context, ALuint buffer, AL
#endif
#endif
-#ifndef AL_EXT_int32
-#define AL_EXT_int32
+#ifndef AL_EXT_32bit_formats
+#define AL_EXT_32bit_formats
#define AL_FORMAT_MONO_I32 0x1202 /* Same as AL_FORMAT_MONO32 */
#define AL_FORMAT_STEREO_I32 0x1203 /* Same as AL_FORMAT_STEREO32 */
#define AL_FORMAT_REAR_I32 0x19DB
-#define AL_FORMAT_QUAD_I32 0x19DC
-#define AL_FORMAT_51CHN_I32 0x19DD
-#define AL_FORMAT_61CHN_I32 0x19DE
-#define AL_FORMAT_71CHN_I32 0x19DF
-#define AL_FORMAT_UHJ2CHN_I32 0x19E0
-#define AL_FORMAT_UHJ3CHN_I32 0x19E1
-#define AL_FORMAT_UHJ4CHN_I32 0x19E2
-
-#define AL_FORMAT_REAR_FLOAT32 0x19E3
-#define AL_FORMAT_QUAD_FLOAT32 0x19E4
-#define AL_FORMAT_51CHN_FLOAT32 0x19E5
-#define AL_FORMAT_61CHN_FLOAT32 0x19E6
-#define AL_FORMAT_71CHN_FLOAT32 0x19E7
+#define AL_FORMAT_REAR_FLOAT32 0x19DC
+#define AL_FORMAT_QUAD_I32 0x19DD
+#define AL_FORMAT_QUAD_FLOAT32 0x19DE
+#define AL_FORMAT_51CHN_I32 0x19DF
+#define AL_FORMAT_51CHN_FLOAT32 0x19E0
+#define AL_FORMAT_61CHN_I32 0x19E1
+#define AL_FORMAT_61CHN_FLOAT32 0x19E2
+#define AL_FORMAT_71CHN_I32 0x19E3
+#define AL_FORMAT_71CHN_FLOAT32 0x19E4
+
+#define AL_FORMAT_UHJ2CHN_I32 0x19E5
+#define AL_FORMAT_UHJ3CHN_I32 0x19E6
+#define AL_FORMAT_UHJ4CHN_I32 0x19E7
#endif
/* Non-standard exports. Not part of any extension. */
@@ -436,5 +437,6 @@ void AL_APIENTRY alGetInteger64vDirectSOFT(ALCcontext *context, ALenum pname, AL
#ifdef __cplusplus
} /* extern "C" */
#endif
+/* NOLINTEND */
#endif /* INPROGEXT_H */