diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-11 23:29:50 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-11 23:31:02 +0200 |
| commit | 70dd5e7c66b1fe3f82e5b4db2406050baba15f05 (patch) | |
| tree | 3f012200ef3c934f33db1a4ef2b790fae3141860 /gfx/angle/src/common/BitSetIterator.h | |
| parent | 3b7ffb477eec078c7036c92c6a51bb5de6de4f28 (diff) | |
| parent | 8481fa25d246f1968d0a254ee3c6cdd82c60781a (diff) | |
| download | UXP-70dd5e7c66b1fe3f82e5b4db2406050baba15f05.tar UXP-70dd5e7c66b1fe3f82e5b4db2406050baba15f05.tar.gz UXP-70dd5e7c66b1fe3f82e5b4db2406050baba15f05.tar.lz UXP-70dd5e7c66b1fe3f82e5b4db2406050baba15f05.tar.xz UXP-70dd5e7c66b1fe3f82e5b4db2406050baba15f05.zip | |
Merge branch 'ANGLE-rollback'
This resolves #624
Note: Cherry-picked some fixes on top of the ANGLE version that we want to keep.
Diffstat (limited to 'gfx/angle/src/common/BitSetIterator.h')
| -rwxr-xr-x | gfx/angle/src/common/BitSetIterator.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gfx/angle/src/common/BitSetIterator.h b/gfx/angle/src/common/BitSetIterator.h index 7fecd3769..3248ce44c 100755 --- a/gfx/angle/src/common/BitSetIterator.h +++ b/gfx/angle/src/common/BitSetIterator.h @@ -104,6 +104,7 @@ inline unsigned long ScanForward(unsigned long bits) unsigned long firstBitIndex = 0ul; unsigned char ret = _BitScanForward(&firstBitIndex, bits); ASSERT(ret != 0); + UNUSED_ASSERTION_VARIABLE(ret); return firstBitIndex; #elif defined(ANGLE_PLATFORM_POSIX) return static_cast<unsigned long>(__builtin_ctzl(bits)); |