ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Make various PixelFormat assertions print the actual value. 

Otherwise they are pretty useless.
pull/275/head
Vladimír Vondruš 6 years ago
parent
241cde706f
commit
6c98d10be5
3 changed files with 17 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/Magnum/PixelFormat.cpp
  2. 8
      src/Magnum/PixelFormat.h
  3. 18
      src/Magnum/Test/PixelFormatTest.cpp

8
src/Magnum/PixelFormat.cpp
Unescape View File

@ -35,8 +35,8 @@
namespace Magnum { namespace Magnum {
UnsignedInt pixelSize(const PixelFormat format) { UnsignedInt pixelSize(const PixelFormat format) {
CORRADE_ASSERT(!(UnsignedInt(format) & (1 << 31)), CORRADE_ASSERT(!isPixelFormatImplementationSpecific(format),
"pixelSize(): can't determine size of an implementation-specific format", {}); "pixelSize(): can't determine size of an implementation-specific format" << reinterpret_cast<void*>(pixelFormatUnwrap(format)), {});
#ifdef __GNUC__ #ifdef __GNUC__
#pragma GCC diagnostic push #pragma GCC diagnostic push
@ -168,7 +168,7 @@ constexpr UnsignedShort CompressedBlockData[] {
Vector3i compressedBlockSize(const CompressedPixelFormat format) { Vector3i compressedBlockSize(const CompressedPixelFormat format) {
CORRADE_ASSERT(!(UnsignedInt(format) & (1 << 31)), CORRADE_ASSERT(!(UnsignedInt(format) & (1 << 31)),
"compressedBlockSize(): can't determine size of an implementation-specific format", {}); "compressedBlockSize(): can't determine size of an implementation-specific format" << reinterpret_cast<void*>(compressedPixelFormatUnwrap(format)), {});
CORRADE_ASSERT(UnsignedInt(format) - 1 < Containers::arraySize(CompressedBlockData), CORRADE_ASSERT(UnsignedInt(format) - 1 < Containers::arraySize(CompressedBlockData),
"compressedBlockSize(): invalid format" << format, {}); "compressedBlockSize(): invalid format" << format, {});
@ -182,7 +182,7 @@ Vector3i compressedBlockSize(const CompressedPixelFormat format) {
UnsignedInt compressedBlockDataSize(const CompressedPixelFormat format) { UnsignedInt compressedBlockDataSize(const CompressedPixelFormat format) {
CORRADE_ASSERT(!(UnsignedInt(format) & (1 << 31)), CORRADE_ASSERT(!(UnsignedInt(format) & (1 << 31)),
"compressedBlockDataSize(): can't determine size of an implementation-specific format", {}); "compressedBlockDataSize(): can't determine size of an implementation-specific format" << reinterpret_cast<void*>(compressedPixelFormatUnwrap(format)), {});
CORRADE_ASSERT(UnsignedInt(format) - 1 < Containers::arraySize(CompressedBlockData), CORRADE_ASSERT(UnsignedInt(format) - 1 < Containers::arraySize(CompressedBlockData),
"compressedBlockDataSize(): invalid format" << format, {}); "compressedBlockDataSize(): invalid format" << format, {});

8
src/Magnum/PixelFormat.h
Unescape View File

@ -712,7 +712,7 @@ template<class T> constexpr PixelFormat pixelFormatWrap(T implementationSpecific
static_assert(sizeof(T) <= 4, static_assert(sizeof(T) <= 4,
"format types larger than 32bits are not supported"); "format types larger than 32bits are not supported");
return CORRADE_CONSTEXPR_ASSERT(!(UnsignedInt(implementationSpecific) & (1u << 31)), return CORRADE_CONSTEXPR_ASSERT(!(UnsignedInt(implementationSpecific) & (1u << 31)),
"pixelFormatWrap(): implementation-specific value already wrapped or too large"), "pixelFormatWrap(): implementation-specific value" << reinterpret_cast<void*>(implementationSpecific) << "already wrapped or too large"),
PixelFormat((1u << 31)|UnsignedInt(implementationSpecific)); PixelFormat((1u << 31)|UnsignedInt(implementationSpecific));
} }
@ -726,7 +726,7 @@ inverse operation.
*/ */
template<class T = UnsignedInt> constexpr T pixelFormatUnwrap(PixelFormat format) { template<class T = UnsignedInt> constexpr T pixelFormatUnwrap(PixelFormat format) {
return CORRADE_CONSTEXPR_ASSERT(UnsignedInt(format) & (1u << 31), return CORRADE_CONSTEXPR_ASSERT(UnsignedInt(format) & (1u << 31),
"pixelFormatUnwrap(): format doesn't contain a wrapped implementation-specific value"), "pixelFormatUnwrap():" << format << "isn't a wrapped implementation-specific value"),
T(UnsignedInt(format) & ~(1u << 31)); T(UnsignedInt(format) & ~(1u << 31));
} }
@ -2286,7 +2286,7 @@ template<class T> constexpr CompressedPixelFormat compressedPixelFormatWrap(T im
static_assert(sizeof(T) <= 4, static_assert(sizeof(T) <= 4,
"format types larger than 32bits are not supported"); "format types larger than 32bits are not supported");
return CORRADE_CONSTEXPR_ASSERT(!(UnsignedInt(implementationSpecific) & (1u << 31)), return CORRADE_CONSTEXPR_ASSERT(!(UnsignedInt(implementationSpecific) & (1u << 31)),
"compressedPixelFormatWrap(): implementation-specific value already wrapped or too large"), "compressedPixelFormatWrap(): implementation-specific value" << reinterpret_cast<void*>(implementationSpecific) << "already wrapped or too large"),
CompressedPixelFormat((1u << 31)|UnsignedInt(implementationSpecific)); CompressedPixelFormat((1u << 31)|UnsignedInt(implementationSpecific));
} }
@ -2300,7 +2300,7 @@ inverse operation.
*/ */
template<class T = UnsignedInt> constexpr T compressedPixelFormatUnwrap(CompressedPixelFormat format) { template<class T = UnsignedInt> constexpr T compressedPixelFormatUnwrap(CompressedPixelFormat format) {
return CORRADE_CONSTEXPR_ASSERT(UnsignedInt(format) & (1u << 31), return CORRADE_CONSTEXPR_ASSERT(UnsignedInt(format) & (1u << 31),
"compressedPixelFormatUnwrap(): format doesn't contain a wrapped implementation-specific value"), "compressedPixelFormatUnwrap():" << format << "isn't a wrapped implementation-specific value"),
T(UnsignedInt(format) & ~(1u << 31)); T(UnsignedInt(format) & ~(1u << 31));
} }

18
src/Magnum/Test/PixelFormatTest.cpp
Unescape View File

@ -218,7 +218,7 @@ void PixelFormatTest::sizeImplementationSpecific() {
pixelSize(pixelFormatWrap(0xdead)); pixelSize(pixelFormatWrap(0xdead));
CORRADE_COMPARE(out.str(), "pixelSize(): can't determine size of an implementation-specific format\n"); CORRADE_COMPARE(out.str(), "pixelSize(): can't determine size of an implementation-specific format 0xdead\n");
} }
void PixelFormatTest::compressedBlockSize() { void PixelFormatTest::compressedBlockSize() {
@ -258,8 +258,8 @@ void PixelFormatTest::compressedBlockSizeImplementationSpecific() {
compressedBlockDataSize(compressedPixelFormatWrap(0xdead)); compressedBlockDataSize(compressedPixelFormatWrap(0xdead));
CORRADE_COMPARE(out.str(), CORRADE_COMPARE(out.str(),
"compressedBlockSize(): can't determine size of an implementation-specific format\n" "compressedBlockSize(): can't determine size of an implementation-specific format 0xdead\n"
"compressedBlockDataSize(): can't determine size of an implementation-specific format\n"); "compressedBlockDataSize(): can't determine size of an implementation-specific format 0xdead\n");
} }
void PixelFormatTest::isImplementationSpecific() { void PixelFormatTest::isImplementationSpecific() {
@ -280,7 +280,7 @@ void PixelFormatTest::wrapInvalid() {
pixelFormatWrap(0xdeadbeef); pixelFormatWrap(0xdeadbeef);
CORRADE_COMPARE(out.str(), "pixelFormatWrap(): implementation-specific value already wrapped or too large\n"); CORRADE_COMPARE(out.str(), "pixelFormatWrap(): implementation-specific value 0xdeadbeef already wrapped or too large\n");
} }
void PixelFormatTest::unwrap() { void PixelFormatTest::unwrap() {
@ -292,9 +292,9 @@ void PixelFormatTest::unwrapInvalid() {
std::ostringstream out; std::ostringstream out;
Error redirectError{&out}; Error redirectError{&out};
pixelFormatUnwrap(PixelFormat(0xdead)); pixelFormatUnwrap(PixelFormat::R8Snorm);
CORRADE_COMPARE(out.str(), "pixelFormatUnwrap(): format doesn't contain a wrapped implementation-specific value\n"); CORRADE_COMPARE(out.str(), "pixelFormatUnwrap(): PixelFormat::R8Snorm isn't a wrapped implementation-specific value\n");
} }
void PixelFormatTest::compressedIsImplementationSpecific() { void PixelFormatTest::compressedIsImplementationSpecific() {
@ -312,7 +312,7 @@ void PixelFormatTest::compressedWrapInvalid() {
compressedPixelFormatWrap(0xdeadbeef); compressedPixelFormatWrap(0xdeadbeef);
CORRADE_COMPARE(out.str(), "compressedPixelFormatWrap(): implementation-specific value already wrapped or too large\n"); CORRADE_COMPARE(out.str(), "compressedPixelFormatWrap(): implementation-specific value 0xdeadbeef already wrapped or too large\n");
} }
void PixelFormatTest::compressedUnwrap() { void PixelFormatTest::compressedUnwrap() {
@ -323,9 +323,9 @@ void PixelFormatTest::compressedUnwrapInvalid() {
std::ostringstream out; std::ostringstream out;
Error redirectError{&out}; Error redirectError{&out};
compressedPixelFormatUnwrap(CompressedPixelFormat(0xdead)); compressedPixelFormatUnwrap(CompressedPixelFormat::EacR11Snorm);
CORRADE_COMPARE(out.str(), "compressedPixelFormatUnwrap(): format doesn't contain a wrapped implementation-specific value\n"); CORRADE_COMPARE(out.str(), "compressedPixelFormatUnwrap(): CompressedPixelFormat::EacR11Snorm isn't a wrapped implementation-specific value\n");
} }
void PixelFormatTest::debug() { void PixelFormatTest::debug() {

Write Preview
Loading…
Cancel
Save