H3cJP/citra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

astc: OutputBitStream style changes and make it constexpr

Browse Source
This commit is contained in:
ReinUsesLisp 2020-04-09 02:37:51 -03:00
parent 449255675d
commit 0efc230381
1 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/video_core/textures/astc.cpp
View File

@ -40,17 +40,17 @@ constexpr u32 Popcnt(u32 n) {
class InputBitStream { class InputBitStream {
public: public:
explicit InputBitStream(const u8* ptr, std::size_t start_offset = 0) explicit InputBitStream(const u8* ptr, std::size_t start_offset = 0)
: m_CurByte(ptr), m_NextBit(start_offset % 8) {} : cur_byte(ptr), next_bit(start_offset % 8) {}
std::size_t GetBitsRead() const { std::size_t GetBitsRead() const {
return m_BitsRead; return m_BitsRead;
} }
u32 ReadBit() { u32 ReadBit() {
u32 bit = *m_CurByte >> m_NextBit++; u32 bit = *cur_byte >> next_bit++;
while (m_NextBit >= 8) { while (next_bit >= 8) {
m_NextBit -= 8; next_bit -= 8;
m_CurByte++; cur_byte++;
} }
m_BitsRead++; m_BitsRead++;
@ -75,64 +75,58 @@ public:
} }
private: private:
const u8* m_CurByte; const u8* cur_byte;
std::size_t m_NextBit = 0; std::size_t next_bit = 0;
std::size_t m_BitsRead = 0; std::size_t m_BitsRead = 0;
}; };
class OutputBitStream { class OutputBitStream {
public: public:
explicit OutputBitStream(u8* ptr, s32 nBits = 0, s32 start_offset = 0) constexpr explicit OutputBitStream(u8* ptr, std::size_t bits = 0, std::size_t start_offset = 0)
: m_NumBits(nBits), m_CurByte(ptr), m_NextBit(start_offset % 8) {} : cur_byte{ptr}, num_bits{bits}, next_bit{start_offset % 8} {}
~OutputBitStream() = default; constexpr std::size_t GetBitsWritten() const {
return bits_written;
s32 GetBitsWritten() const {
return m_BitsWritten;
} }
void WriteBitsR(u32 val, u32 nBits) { constexpr void WriteBitsR(u32 val, u32 nBits) {
for (u32 i = 0; i < nBits; i++) { for (u32 i = 0; i < nBits; i++) {
WriteBit((val >> (nBits - i - 1)) & 1); WriteBit((val >> (nBits - i - 1)) & 1);
} }
} }
void WriteBits(u32 val, u32 nBits) { constexpr void WriteBits(u32 val, u32 nBits) {
for (u32 i = 0; i < nBits; i++) { for (u32 i = 0; i < nBits; i++) {
WriteBit((val >> i) & 1); WriteBit((val >> i) & 1);
} }
} }
private: private:
void WriteBit(s32 b) { constexpr void WriteBit(bool b) {
if (bits_written >= num_bits) {
if (done)
return; return;
}
const u32 mask = 1 << m_NextBit++; const u32 mask = 1 << next_bit++;
// clear the bit // clear the bit
*m_CurByte &= static_cast<u8>(~mask); *cur_byte &= static_cast<u8>(~mask);
// Write the bit, if necessary // Write the bit, if necessary
if (b) if (b)
*m_CurByte |= static_cast<u8>(mask); *cur_byte |= static_cast<u8>(mask);
// Next byte? // Next byte?
if (m_NextBit >= 8) { if (next_bit >= 8) {
m_CurByte += 1; cur_byte += 1;
m_NextBit = 0; next_bit = 0;
} }
done = done || ++m_BitsWritten >= m_NumBits;
} }
s32 m_BitsWritten = 0; u8* cur_byte;
const s32 m_NumBits; std::size_t num_bits;
u8* m_CurByte; std::size_t bits_written = 0;
s32 m_NextBit = 0; std::size_t next_bit = 0;
bool done = false;
}; };
template <typename IntType> template <typename IntType>