diff options
| author | Chris Robinson <chris.kcat@gmail.com> | 2019-09-11 14:33:26 -0700 |
|---|---|---|
| committer | Chris Robinson <chris.kcat@gmail.com> | 2019-09-11 14:33:26 -0700 |
| commit | 07e2aa3bc0c7dde66b332e400f71bfd0d9cb1c5f (patch) | |
| tree | c1e63112052126556eeac599a31b7c5a2c794aa7 /al/buffer.h | |
| parent | 681c78d3485357ff9fae6b98ad2c20c83c767aba (diff) | |
Clean up some more implicit conversions
Diffstat (limited to 'al/buffer.h')
| -rw-r--r-- | al/buffer.h | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/al/buffer.h b/al/buffer.h index 2c01aae2..70faf56e 100644 --- a/al/buffer.h +++ b/al/buffer.h @@ -35,11 +35,6 @@ enum UserFmtChannels : unsigned char { UserFmtBFormat3D, /* WXYZ */ }; -ALsizei BytesFromUserFmt(UserFmtType type); -ALsizei ChannelsFromUserFmt(UserFmtChannels chans); -inline ALsizei FrameSizeFromUserFmt(UserFmtChannels chans, UserFmtType type) -{ return ChannelsFromUserFmt(chans) * BytesFromUserFmt(type); } - /* Storable formats */ enum FmtType : unsigned char { @@ -64,9 +59,9 @@ enum FmtChannels : unsigned char { #define MAX_INPUT_CHANNELS (8) -ALsizei BytesFromFmt(FmtType type); -ALsizei ChannelsFromFmt(FmtChannels chans); -inline ALsizei FrameSizeFromFmt(FmtChannels chans, FmtType type) +ALuint BytesFromFmt(FmtType type); +ALuint ChannelsFromFmt(FmtChannels chans); +inline ALuint FrameSizeFromFmt(FmtChannels chans, FmtType type) { return ChannelsFromFmt(chans) * BytesFromFmt(type); } @@ -81,14 +76,14 @@ struct ALbuffer { FmtType mFmtType{}; UserFmtType OriginalType{}; - ALsizei OriginalSize{0}; - ALsizei OriginalAlign{0}; + ALuint OriginalSize{0}; + ALuint OriginalAlign{0}; ALuint LoopStart{0u}; ALuint LoopEnd{0u}; - std::atomic<ALsizei> UnpackAlign{0}; - std::atomic<ALsizei> PackAlign{0}; + ALuint UnpackAlign{0}; + ALuint PackAlign{0}; ALbitfieldSOFT MappedAccess{0u}; ALsizei MappedOffset{0}; |