mirror of
https://github.com/BinomialLLC/basis_universal.git
synced 2026-10-14 13:05:30 +00:00
merging v2.0 from xuastc_private
This commit is contained in:
9
encoder/3rdparty/android_astc_decomp.cpp
vendored
9
encoder/3rdparty/android_astc_decomp.cpp
vendored
@@ -836,11 +836,13 @@ void decodeISETritBlock (ISEDecodedResult* dst, int numValues, BitAccessStream&
|
||||
m[4] = data.getNext(numBits);
|
||||
deUint32 T7 = data.getNext(1);
|
||||
|
||||
#ifndef __clang__
|
||||
#ifndef __EMSCRIPTEN__
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough="
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
switch (numValues)
|
||||
{
|
||||
@@ -853,10 +855,12 @@ void decodeISETritBlock (ISEDecodedResult* dst, int numValues, BitAccessStream&
|
||||
default:
|
||||
DE_ASSERT(false);
|
||||
}
|
||||
#ifndef __clang__
|
||||
#ifndef __EMSCRIPTEN__
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
const deUint32 T = (T7 << 7) | (T56 << 5) | (T4 << 4) | (T23 << 2) | (T01 << 0);
|
||||
@@ -902,11 +906,13 @@ void decodeISEQuintBlock (ISEDecodedResult* dst, int numValues, BitAccessStream&
|
||||
m[2] = data.getNext(numBits);
|
||||
deUint32 Q56 = data.getNext(2);
|
||||
|
||||
#ifndef __clang__
|
||||
#ifndef __EMSCRIPTEN__
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough="
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
switch (numValues)
|
||||
{
|
||||
@@ -917,10 +923,13 @@ void decodeISEQuintBlock (ISEDecodedResult* dst, int numValues, BitAccessStream&
|
||||
default:
|
||||
DE_ASSERT(false);
|
||||
}
|
||||
|
||||
#ifndef __clang__
|
||||
#ifndef __EMSCRIPTEN__
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
const deUint32 Q = (Q56 << 5) | (Q34 << 3) | (Q012 << 0);
|
||||
|
||||
Reference in New Issue
Block a user