ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
10487 Commits
21 Branches
19 Tags
70 MiB
Tree: 21cff30b27
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '21cff30b27'
${ noResults }
magnum/src/Magnum/GL/PixelFormat.cpp

582 lines
19 KiB
Raw Normal View History Unescape

Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
/*
This file is part of Magnum.
Updated copyright year.
6 years ago
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
Updated copyright year.
4 years ago
2020, 2021, 2022 Vladimír Vondruš <mosra@centrum.cz>
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
*/
Pixel storage support, part 2: renamed ColorFormat to PixelFormat etc. Yeah, sorry, I know, the enums are renamed for second or third time in a row, first they were Image::Format, then ImageFormat, then ColorFormat and now PixelFormat. But this time it's final and last time they are renamed and now everything is finally consistent: * ColorFormat::DepthComponent -- depth is not a color, thus PixelFormat::DepthComponent makes a lot more sense. * There will be PixelStorage classes, which will be stored in images alonside PixelFormat/PixelType enums, making everything nicely aligned. * The GL documentation about glTexImage2D() etc. denotes the <format> and <type> parameters as format and type of *pixel* data, so now we are _finally_ consistent with the official naming. I wonder why did I not choose PixelFormat originally. Anyway, the old <Magnum/ColorFormat.h> header, ColorFormat, ColorType and CompressedColorFormat types are now aliases to the new ones, are marked as deprecated and will be removed in some future release (as always, I'm waiting at least six months before removing the deprecated functionality).
11 years ago
#include "PixelFormat.h"
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
Split the OpenGL layer out, pt 8: move out GL-specific PixelStorage parts. The general part stays in the root namespace, while the GL-specific stuff goes to the GL namespace. Also all GL-specific documentation was moved to relevant APIs in the GL namespace. This finally allows me to build PixelStorage.cpp as part of the root namespace. The PixelStorage::pixelSize() function and PixelStorage::dataProperties() taking a pair of GL::PixelFormat / GL::PixelType enums is deprecated, use GL::pixelSize() and dataProperties() taking pixel size directly instead. A lot of code is still using these, including images; the deprecated aliases are inlined in the header to avoid a compile-time dependency on the GL library.
8 years ago
#include <Corrade/Utility/Assert.h>
Split the OpenGL layer out, pt 9: generic pixel formats. This is quite big, so: * There are new Magnum::PixelFormat and Magnum::CompressedPixelFormat enums, which contain generic API-independent formats. In particular, PixelFormat replaces GL::PixelFormat and GL::PixelType with a single value. * There's GL::pixelFormat(), GL::pixelType(), GL::compressedPixelFormat() to convert the generic enums to GL-specific. The mapping is only in one direction, done with a lookup table (generic enums are indices to that table). * GL classes taking the formats directly (such as GL::BufferImage) have overloads that take both the GL-specific and generic format. * The generic Image, CompressedImage, ImageView, CompressedImageView, and Trade::ImageData classes now accept the generic formats first-class. However, it's also possible to store an implementation-specific value to cover cases where a generic format enum doesn't have support for a particular format. This is done by wrapping the value using pixelFormatWrap() or compressedPixelFormatWrap(). Particular GPU APIs then assume it's their implementation-specific value and extract the value back using pixelFormatUnwrap() or compressedPixelFormatUnwrap(). There's also an isPixelFormatImplementationSpecific() and isCompressedPixelFormatImplementationSpecific() that distinguishes these values. * Many operations need pixel size and in order to have it even for implementation-specific formats, a corresponding pixelSize() overload is found via ADL on construction and the calculated size stored along the format. Previously the pixel size was only calculated on demand, but that's not possible now. In case such overload is not available, it's possible to pass pixel size manually as well. * In order to support the GL format+type pair, Image, ImageView and Trade::ImageData, there's now an additional untyped formatExtra() field that holds the second value. * The CompressedPixelStorage class is now unconditionally available on all targets, including OpenGL ES and WebGL. However, on OpenGL ES the GL APIs expect that it's all at default values. I attempted to preserve backwards compatibility as much as possible: * The PixelFormat and CompressedPixelFormat enum now contains generic API-independent values. The GL-specific formats are present there, but marked as deprecated. Use either the generic values or GL::PixelFormat (togehter with GL::PixelType) and GL::CompressedPixelFormat instead. There's a lot of ugliness caused by this, but seems to work well. * *Image::type() functions are deprecated as they were too GL-specific. Use formatExtra() and cast it to GL::PixelType instead. * Image constructors take templated format or format+extra arguments, so passing GL-specific values to them should still work.
8 years ago
#include <Corrade/Containers/ArrayView.h>
Making includes absolute, part 4: using absolute includes for Corrade. Also adapted to some Corrade renames.
12 years ago
#include <Corrade/Utility/Debug.h>
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
Split the OpenGL layer out, pt 9: generic pixel formats. This is quite big, so: * There are new Magnum::PixelFormat and Magnum::CompressedPixelFormat enums, which contain generic API-independent formats. In particular, PixelFormat replaces GL::PixelFormat and GL::PixelType with a single value. * There's GL::pixelFormat(), GL::pixelType(), GL::compressedPixelFormat() to convert the generic enums to GL-specific. The mapping is only in one direction, done with a lookup table (generic enums are indices to that table). * GL classes taking the formats directly (such as GL::BufferImage) have overloads that take both the GL-specific and generic format. * The generic Image, CompressedImage, ImageView, CompressedImageView, and Trade::ImageData classes now accept the generic formats first-class. However, it's also possible to store an implementation-specific value to cover cases where a generic format enum doesn't have support for a particular format. This is done by wrapping the value using pixelFormatWrap() or compressedPixelFormatWrap(). Particular GPU APIs then assume it's their implementation-specific value and extract the value back using pixelFormatUnwrap() or compressedPixelFormatUnwrap(). There's also an isPixelFormatImplementationSpecific() and isCompressedPixelFormatImplementationSpecific() that distinguishes these values. * Many operations need pixel size and in order to have it even for implementation-specific formats, a corresponding pixelSize() overload is found via ADL on construction and the calculated size stored along the format. Previously the pixel size was only calculated on demand, but that's not possible now. In case such overload is not available, it's possible to pass pixel size manually as well. * In order to support the GL format+type pair, Image, ImageView and Trade::ImageData, there's now an additional untyped formatExtra() field that holds the second value. * The CompressedPixelStorage class is now unconditionally available on all targets, including OpenGL ES and WebGL. However, on OpenGL ES the GL APIs expect that it's all at default values. I attempted to preserve backwards compatibility as much as possible: * The PixelFormat and CompressedPixelFormat enum now contains generic API-independent values. The GL-specific formats are present there, but marked as deprecated. Use either the generic values or GL::PixelFormat (togehter with GL::PixelType) and GL::CompressedPixelFormat instead. There's a lot of ugliness caused by this, but seems to work well. * *Image::type() functions are deprecated as they were too GL-specific. Use formatExtra() and cast it to GL::PixelType instead. * Image constructors take templated format or format+extra arguments, so passing GL-specific values to them should still work.
8 years ago
#include "Magnum/PixelFormat.h"
GL: added hasTextureFormat() and textureFormat() helpers.
7 years ago
#include "Magnum/GL/TextureFormat.h"
Split the OpenGL layer out, pt 9: generic pixel formats. This is quite big, so: * There are new Magnum::PixelFormat and Magnum::CompressedPixelFormat enums, which contain generic API-independent formats. In particular, PixelFormat replaces GL::PixelFormat and GL::PixelType with a single value. * There's GL::pixelFormat(), GL::pixelType(), GL::compressedPixelFormat() to convert the generic enums to GL-specific. The mapping is only in one direction, done with a lookup table (generic enums are indices to that table). * GL classes taking the formats directly (such as GL::BufferImage) have overloads that take both the GL-specific and generic format. * The generic Image, CompressedImage, ImageView, CompressedImageView, and Trade::ImageData classes now accept the generic formats first-class. However, it's also possible to store an implementation-specific value to cover cases where a generic format enum doesn't have support for a particular format. This is done by wrapping the value using pixelFormatWrap() or compressedPixelFormatWrap(). Particular GPU APIs then assume it's their implementation-specific value and extract the value back using pixelFormatUnwrap() or compressedPixelFormatUnwrap(). There's also an isPixelFormatImplementationSpecific() and isCompressedPixelFormatImplementationSpecific() that distinguishes these values. * Many operations need pixel size and in order to have it even for implementation-specific formats, a corresponding pixelSize() overload is found via ADL on construction and the calculated size stored along the format. Previously the pixel size was only calculated on demand, but that's not possible now. In case such overload is not available, it's possible to pass pixel size manually as well. * In order to support the GL format+type pair, Image, ImageView and Trade::ImageData, there's now an additional untyped formatExtra() field that holds the second value. * The CompressedPixelStorage class is now unconditionally available on all targets, including OpenGL ES and WebGL. However, on OpenGL ES the GL APIs expect that it's all at default values. I attempted to preserve backwards compatibility as much as possible: * The PixelFormat and CompressedPixelFormat enum now contains generic API-independent values. The GL-specific formats are present there, but marked as deprecated. Use either the generic values or GL::PixelFormat (togehter with GL::PixelType) and GL::CompressedPixelFormat instead. There's a lot of ugliness caused by this, but seems to work well. * *Image::type() functions are deprecated as they were too GL-specific. Use formatExtra() and cast it to GL::PixelType instead. * Image constructors take templated format or format+extra arguments, so passing GL-specific values to them should still work.
8 years ago
Split the OpenGL layer out, pt 4: new Magnum::GL namespace. At the moment just the GL library itself w/o the tests, and without backwards compatibility aliases. The following types were left in the root namespace, despite being in the GL/ directory, as they will get moved back soon: * Image, CompressedImage and their dimensional typedefs * ImageView, CompressedImageView and their dimensional typedefs * PixelStorage Not PixelFormat etc., that one will stay in the GL namespace and a completely new PixelFormat enum will be provided in the root namespace.
8 years ago
namespace Magnum { namespace GL {
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
Split the OpenGL layer out, pt 9: generic pixel formats. This is quite big, so: * There are new Magnum::PixelFormat and Magnum::CompressedPixelFormat enums, which contain generic API-independent formats. In particular, PixelFormat replaces GL::PixelFormat and GL::PixelType with a single value. * There's GL::pixelFormat(), GL::pixelType(), GL::compressedPixelFormat() to convert the generic enums to GL-specific. The mapping is only in one direction, done with a lookup table (generic enums are indices to that table). * GL classes taking the formats directly (such as GL::BufferImage) have overloads that take both the GL-specific and generic format. * The generic Image, CompressedImage, ImageView, CompressedImageView, and Trade::ImageData classes now accept the generic formats first-class. However, it's also possible to store an implementation-specific value to cover cases where a generic format enum doesn't have support for a particular format. This is done by wrapping the value using pixelFormatWrap() or compressedPixelFormatWrap(). Particular GPU APIs then assume it's their implementation-specific value and extract the value back using pixelFormatUnwrap() or compressedPixelFormatUnwrap(). There's also an isPixelFormatImplementationSpecific() and isCompressedPixelFormatImplementationSpecific() that distinguishes these values. * Many operations need pixel size and in order to have it even for implementation-specific formats, a corresponding pixelSize() overload is found via ADL on construction and the calculated size stored along the format. Previously the pixel size was only calculated on demand, but that's not possible now. In case such overload is not available, it's possible to pass pixel size manually as well. * In order to support the GL format+type pair, Image, ImageView and Trade::ImageData, there's now an additional untyped formatExtra() field that holds the second value. * The CompressedPixelStorage class is now unconditionally available on all targets, including OpenGL ES and WebGL. However, on OpenGL ES the GL APIs expect that it's all at default values. I attempted to preserve backwards compatibility as much as possible: * The PixelFormat and CompressedPixelFormat enum now contains generic API-independent values. The GL-specific formats are present there, but marked as deprecated. Use either the generic values or GL::PixelFormat (togehter with GL::PixelType) and GL::CompressedPixelFormat instead. There's a lot of ugliness caused by this, but seems to work well. * *Image::type() functions are deprecated as they were too GL-specific. Use formatExtra() and cast it to GL::PixelType instead. * Image constructors take templated format or format+extra arguments, so passing GL-specific values to them should still work.
8 years ago
namespace {
#ifndef DOXYGEN_GENERATING_OUTPUT /* It gets *really* confused */
constexpr struct {
PixelFormat format;
PixelType type;
} FormatMapping[] {
GL: added hasTextureFormat() and textureFormat() helpers.
7 years ago
#define _c(input, format, type, textureFormat) {PixelFormat::format, PixelType::type},
GL: I *knew* there was a reason I did this.
7 years ago
/* GCC 4.8 doesn't like just a {} for default enum values */
GL: added hasTextureFormat() and textureFormat() helpers.
7 years ago
#define _n(input, format, type) {PixelFormat::format, PixelType::type},
GL: I *knew* there was a reason I did this.
7 years ago
#define _s(input) {PixelFormat{}, PixelType{}},
Split the OpenGL layer out, pt 9: generic pixel formats. This is quite big, so: * There are new Magnum::PixelFormat and Magnum::CompressedPixelFormat enums, which contain generic API-independent formats. In particular, PixelFormat replaces GL::PixelFormat and GL::PixelType with a single value. * There's GL::pixelFormat(), GL::pixelType(), GL::compressedPixelFormat() to convert the generic enums to GL-specific. The mapping is only in one direction, done with a lookup table (generic enums are indices to that table). * GL classes taking the formats directly (such as GL::BufferImage) have overloads that take both the GL-specific and generic format. * The generic Image, CompressedImage, ImageView, CompressedImageView, and Trade::ImageData classes now accept the generic formats first-class. However, it's also possible to store an implementation-specific value to cover cases where a generic format enum doesn't have support for a particular format. This is done by wrapping the value using pixelFormatWrap() or compressedPixelFormatWrap(). Particular GPU APIs then assume it's their implementation-specific value and extract the value back using pixelFormatUnwrap() or compressedPixelFormatUnwrap(). There's also an isPixelFormatImplementationSpecific() and isCompressedPixelFormatImplementationSpecific() that distinguishes these values. * Many operations need pixel size and in order to have it even for implementation-specific formats, a corresponding pixelSize() overload is found via ADL on construction and the calculated size stored along the format. Previously the pixel size was only calculated on demand, but that's not possible now. In case such overload is not available, it's possible to pass pixel size manually as well. * In order to support the GL format+type pair, Image, ImageView and Trade::ImageData, there's now an additional untyped formatExtra() field that holds the second value. * The CompressedPixelStorage class is now unconditionally available on all targets, including OpenGL ES and WebGL. However, on OpenGL ES the GL APIs expect that it's all at default values. I attempted to preserve backwards compatibility as much as possible: * The PixelFormat and CompressedPixelFormat enum now contains generic API-independent values. The GL-specific formats are present there, but marked as deprecated. Use either the generic values or GL::PixelFormat (togehter with GL::PixelType) and GL::CompressedPixelFormat instead. There's a lot of ugliness caused by this, but seems to work well. * *Image::type() functions are deprecated as they were too GL-specific. Use formatExtra() and cast it to GL::PixelType instead. * Image constructors take templated format or format+extra arguments, so passing GL-specific values to them should still work.
8 years ago
#include "Magnum/GL/Implementation/pixelFormatMapping.hpp"
#undef _s
GL: added hasTextureFormat() and textureFormat() helpers.
7 years ago
#undef _n
#undef _c
};
constexpr TextureFormat TextureFormatMapping[] {
#define _c(input, format, type, textureFormat) TextureFormat::textureFormat,
GL: I *knew* there was a reason I did this.
7 years ago
/* GCC 4.8 doesn't like just a {} for default enum values */
#define _n(input, format, type) TextureFormat{},
#define _s(input) TextureFormat{},
GL: added hasTextureFormat() and textureFormat() helpers.
7 years ago
#include "Magnum/GL/Implementation/pixelFormatMapping.hpp"
#undef _s
#undef _n
Split the OpenGL layer out, pt 9: generic pixel formats. This is quite big, so: * There are new Magnum::PixelFormat and Magnum::CompressedPixelFormat enums, which contain generic API-independent formats. In particular, PixelFormat replaces GL::PixelFormat and GL::PixelType with a single value. * There's GL::pixelFormat(), GL::pixelType(), GL::compressedPixelFormat() to convert the generic enums to GL-specific. The mapping is only in one direction, done with a lookup table (generic enums are indices to that table). * GL classes taking the formats directly (such as GL::BufferImage) have overloads that take both the GL-specific and generic format. * The generic Image, CompressedImage, ImageView, CompressedImageView, and Trade::ImageData classes now accept the generic formats first-class. However, it's also possible to store an implementation-specific value to cover cases where a generic format enum doesn't have support for a particular format. This is done by wrapping the value using pixelFormatWrap() or compressedPixelFormatWrap(). Particular GPU APIs then assume it's their implementation-specific value and extract the value back using pixelFormatUnwrap() or compressedPixelFormatUnwrap(). There's also an isPixelFormatImplementationSpecific() and isCompressedPixelFormatImplementationSpecific() that distinguishes these values. * Many operations need pixel size and in order to have it even for implementation-specific formats, a corresponding pixelSize() overload is found via ADL on construction and the calculated size stored along the format. Previously the pixel size was only calculated on demand, but that's not possible now. In case such overload is not available, it's possible to pass pixel size manually as well. * In order to support the GL format+type pair, Image, ImageView and Trade::ImageData, there's now an additional untyped formatExtra() field that holds the second value. * The CompressedPixelStorage class is now unconditionally available on all targets, including OpenGL ES and WebGL. However, on OpenGL ES the GL APIs expect that it's all at default values. I attempted to preserve backwards compatibility as much as possible: * The PixelFormat and CompressedPixelFormat enum now contains generic API-independent values. The GL-specific formats are present there, but marked as deprecated. Use either the generic values or GL::PixelFormat (togehter with GL::PixelType) and GL::CompressedPixelFormat instead. There's a lot of ugliness caused by this, but seems to work well. * *Image::type() functions are deprecated as they were too GL-specific. Use formatExtra() and cast it to GL::PixelType instead. * Image constructors take templated format or format+extra arguments, so passing GL-specific values to them should still work.
8 years ago
#undef _c
};
#endif
}
bool hasPixelFormat(const Magnum::PixelFormat format) {
if(isPixelFormatImplementationSpecific(format))
return true;
Reserve zero [Compressed]PixelFormat for an invalid value. Catches accidents better -- just look at the diff. Might catch accidents in your code now as well, so beware!
7 years ago
CORRADE_ASSERT(UnsignedInt(format) - 1 < Containers::arraySize(FormatMapping),
Split the OpenGL layer out, pt 9: generic pixel formats. This is quite big, so: * There are new Magnum::PixelFormat and Magnum::CompressedPixelFormat enums, which contain generic API-independent formats. In particular, PixelFormat replaces GL::PixelFormat and GL::PixelType with a single value. * There's GL::pixelFormat(), GL::pixelType(), GL::compressedPixelFormat() to convert the generic enums to GL-specific. The mapping is only in one direction, done with a lookup table (generic enums are indices to that table). * GL classes taking the formats directly (such as GL::BufferImage) have overloads that take both the GL-specific and generic format. * The generic Image, CompressedImage, ImageView, CompressedImageView, and Trade::ImageData classes now accept the generic formats first-class. However, it's also possible to store an implementation-specific value to cover cases where a generic format enum doesn't have support for a particular format. This is done by wrapping the value using pixelFormatWrap() or compressedPixelFormatWrap(). Particular GPU APIs then assume it's their implementation-specific value and extract the value back using pixelFormatUnwrap() or compressedPixelFormatUnwrap(). There's also an isPixelFormatImplementationSpecific() and isCompressedPixelFormatImplementationSpecific() that distinguishes these values. * Many operations need pixel size and in order to have it even for implementation-specific formats, a corresponding pixelSize() overload is found via ADL on construction and the calculated size stored along the format. Previously the pixel size was only calculated on demand, but that's not possible now. In case such overload is not available, it's possible to pass pixel size manually as well. * In order to support the GL format+type pair, Image, ImageView and Trade::ImageData, there's now an additional untyped formatExtra() field that holds the second value. * The CompressedPixelStorage class is now unconditionally available on all targets, including OpenGL ES and WebGL. However, on OpenGL ES the GL APIs expect that it's all at default values. I attempted to preserve backwards compatibility as much as possible: * The PixelFormat and CompressedPixelFormat enum now contains generic API-independent values. The GL-specific formats are present there, but marked as deprecated. Use either the generic values or GL::PixelFormat (togehter with GL::PixelType) and GL::CompressedPixelFormat instead. There's a lot of ugliness caused by this, but seems to work well. * *Image::type() functions are deprecated as they were too GL-specific. Use formatExtra() and cast it to GL::PixelType instead. * Image constructors take templated format or format+extra arguments, so passing GL-specific values to them should still work.
8 years ago
"GL::hasPixelFormat(): invalid format" << format, {});
Reserve zero [Compressed]PixelFormat for an invalid value. Catches accidents better -- just look at the diff. Might catch accidents in your code now as well, so beware!
7 years ago
return UnsignedInt(FormatMapping[UnsignedInt(format) - 1].format);
Split the OpenGL layer out, pt 9: generic pixel formats. This is quite big, so: * There are new Magnum::PixelFormat and Magnum::CompressedPixelFormat enums, which contain generic API-independent formats. In particular, PixelFormat replaces GL::PixelFormat and GL::PixelType with a single value. * There's GL::pixelFormat(), GL::pixelType(), GL::compressedPixelFormat() to convert the generic enums to GL-specific. The mapping is only in one direction, done with a lookup table (generic enums are indices to that table). * GL classes taking the formats directly (such as GL::BufferImage) have overloads that take both the GL-specific and generic format. * The generic Image, CompressedImage, ImageView, CompressedImageView, and Trade::ImageData classes now accept the generic formats first-class. However, it's also possible to store an implementation-specific value to cover cases where a generic format enum doesn't have support for a particular format. This is done by wrapping the value using pixelFormatWrap() or compressedPixelFormatWrap(). Particular GPU APIs then assume it's their implementation-specific value and extract the value back using pixelFormatUnwrap() or compressedPixelFormatUnwrap(). There's also an isPixelFormatImplementationSpecific() and isCompressedPixelFormatImplementationSpecific() that distinguishes these values. * Many operations need pixel size and in order to have it even for implementation-specific formats, a corresponding pixelSize() overload is found via ADL on construction and the calculated size stored along the format. Previously the pixel size was only calculated on demand, but that's not possible now. In case such overload is not available, it's possible to pass pixel size manually as well. * In order to support the GL format+type pair, Image, ImageView and Trade::ImageData, there's now an additional untyped formatExtra() field that holds the second value. * The CompressedPixelStorage class is now unconditionally available on all targets, including OpenGL ES and WebGL. However, on OpenGL ES the GL APIs expect that it's all at default values. I attempted to preserve backwards compatibility as much as possible: * The PixelFormat and CompressedPixelFormat enum now contains generic API-independent values. The GL-specific formats are present there, but marked as deprecated. Use either the generic values or GL::PixelFormat (togehter with GL::PixelType) and GL::CompressedPixelFormat instead. There's a lot of ugliness caused by this, but seems to work well. * *Image::type() functions are deprecated as they were too GL-specific. Use formatExtra() and cast it to GL::PixelType instead. * Image constructors take templated format or format+extra arguments, so passing GL-specific values to them should still work.
8 years ago
}
GL: added hasTextureFormat() and textureFormat() helpers.
7 years ago
bool hasTextureFormat(const Magnum::PixelFormat format) {
CORRADE_ASSERT(!isPixelFormatImplementationSpecific(format),
"GL::hasTextureFormat(): cannot map an implementation-specific pixel format to an OpenGL texture format", {});
CORRADE_ASSERT(UnsignedInt(format) - 1 < Containers::arraySize(TextureFormatMapping),
"GL::hasTextureFormat(): invalid format" << format, {});
return UnsignedInt(TextureFormatMapping[UnsignedInt(format) - 1]);
}
Split the OpenGL layer out, pt 9: generic pixel formats. This is quite big, so: * There are new Magnum::PixelFormat and Magnum::CompressedPixelFormat enums, which contain generic API-independent formats. In particular, PixelFormat replaces GL::PixelFormat and GL::PixelType with a single value. * There's GL::pixelFormat(), GL::pixelType(), GL::compressedPixelFormat() to convert the generic enums to GL-specific. The mapping is only in one direction, done with a lookup table (generic enums are indices to that table). * GL classes taking the formats directly (such as GL::BufferImage) have overloads that take both the GL-specific and generic format. * The generic Image, CompressedImage, ImageView, CompressedImageView, and Trade::ImageData classes now accept the generic formats first-class. However, it's also possible to store an implementation-specific value to cover cases where a generic format enum doesn't have support for a particular format. This is done by wrapping the value using pixelFormatWrap() or compressedPixelFormatWrap(). Particular GPU APIs then assume it's their implementation-specific value and extract the value back using pixelFormatUnwrap() or compressedPixelFormatUnwrap(). There's also an isPixelFormatImplementationSpecific() and isCompressedPixelFormatImplementationSpecific() that distinguishes these values. * Many operations need pixel size and in order to have it even for implementation-specific formats, a corresponding pixelSize() overload is found via ADL on construction and the calculated size stored along the format. Previously the pixel size was only calculated on demand, but that's not possible now. In case such overload is not available, it's possible to pass pixel size manually as well. * In order to support the GL format+type pair, Image, ImageView and Trade::ImageData, there's now an additional untyped formatExtra() field that holds the second value. * The CompressedPixelStorage class is now unconditionally available on all targets, including OpenGL ES and WebGL. However, on OpenGL ES the GL APIs expect that it's all at default values. I attempted to preserve backwards compatibility as much as possible: * The PixelFormat and CompressedPixelFormat enum now contains generic API-independent values. The GL-specific formats are present there, but marked as deprecated. Use either the generic values or GL::PixelFormat (togehter with GL::PixelType) and GL::CompressedPixelFormat instead. There's a lot of ugliness caused by this, but seems to work well. * *Image::type() functions are deprecated as they were too GL-specific. Use formatExtra() and cast it to GL::PixelType instead. * Image constructors take templated format or format+extra arguments, so passing GL-specific values to them should still work.
8 years ago
PixelFormat pixelFormat(const Magnum::PixelFormat format) {
if(isPixelFormatImplementationSpecific(format))
return pixelFormatUnwrap<GL::PixelFormat>(format);
Reserve zero [Compressed]PixelFormat for an invalid value. Catches accidents better -- just look at the diff. Might catch accidents in your code now as well, so beware!
7 years ago
CORRADE_ASSERT(UnsignedInt(format) - 1 < Containers::arraySize(FormatMapping),
Split the OpenGL layer out, pt 9: generic pixel formats. This is quite big, so: * There are new Magnum::PixelFormat and Magnum::CompressedPixelFormat enums, which contain generic API-independent formats. In particular, PixelFormat replaces GL::PixelFormat and GL::PixelType with a single value. * There's GL::pixelFormat(), GL::pixelType(), GL::compressedPixelFormat() to convert the generic enums to GL-specific. The mapping is only in one direction, done with a lookup table (generic enums are indices to that table). * GL classes taking the formats directly (such as GL::BufferImage) have overloads that take both the GL-specific and generic format. * The generic Image, CompressedImage, ImageView, CompressedImageView, and Trade::ImageData classes now accept the generic formats first-class. However, it's also possible to store an implementation-specific value to cover cases where a generic format enum doesn't have support for a particular format. This is done by wrapping the value using pixelFormatWrap() or compressedPixelFormatWrap(). Particular GPU APIs then assume it's their implementation-specific value and extract the value back using pixelFormatUnwrap() or compressedPixelFormatUnwrap(). There's also an isPixelFormatImplementationSpecific() and isCompressedPixelFormatImplementationSpecific() that distinguishes these values. * Many operations need pixel size and in order to have it even for implementation-specific formats, a corresponding pixelSize() overload is found via ADL on construction and the calculated size stored along the format. Previously the pixel size was only calculated on demand, but that's not possible now. In case such overload is not available, it's possible to pass pixel size manually as well. * In order to support the GL format+type pair, Image, ImageView and Trade::ImageData, there's now an additional untyped formatExtra() field that holds the second value. * The CompressedPixelStorage class is now unconditionally available on all targets, including OpenGL ES and WebGL. However, on OpenGL ES the GL APIs expect that it's all at default values. I attempted to preserve backwards compatibility as much as possible: * The PixelFormat and CompressedPixelFormat enum now contains generic API-independent values. The GL-specific formats are present there, but marked as deprecated. Use either the generic values or GL::PixelFormat (togehter with GL::PixelType) and GL::CompressedPixelFormat instead. There's a lot of ugliness caused by this, but seems to work well. * *Image::type() functions are deprecated as they were too GL-specific. Use formatExtra() and cast it to GL::PixelType instead. * Image constructors take templated format or format+extra arguments, so passing GL-specific values to them should still work.
8 years ago
"GL::pixelFormat(): invalid format" << format, {});
Reserve zero [Compressed]PixelFormat for an invalid value. Catches accidents better -- just look at the diff. Might catch accidents in your code now as well, so beware!
7 years ago
const PixelFormat out = FormatMapping[UnsignedInt(format) - 1].format;
Split the OpenGL layer out, pt 9: generic pixel formats. This is quite big, so: * There are new Magnum::PixelFormat and Magnum::CompressedPixelFormat enums, which contain generic API-independent formats. In particular, PixelFormat replaces GL::PixelFormat and GL::PixelType with a single value. * There's GL::pixelFormat(), GL::pixelType(), GL::compressedPixelFormat() to convert the generic enums to GL-specific. The mapping is only in one direction, done with a lookup table (generic enums are indices to that table). * GL classes taking the formats directly (such as GL::BufferImage) have overloads that take both the GL-specific and generic format. * The generic Image, CompressedImage, ImageView, CompressedImageView, and Trade::ImageData classes now accept the generic formats first-class. However, it's also possible to store an implementation-specific value to cover cases where a generic format enum doesn't have support for a particular format. This is done by wrapping the value using pixelFormatWrap() or compressedPixelFormatWrap(). Particular GPU APIs then assume it's their implementation-specific value and extract the value back using pixelFormatUnwrap() or compressedPixelFormatUnwrap(). There's also an isPixelFormatImplementationSpecific() and isCompressedPixelFormatImplementationSpecific() that distinguishes these values. * Many operations need pixel size and in order to have it even for implementation-specific formats, a corresponding pixelSize() overload is found via ADL on construction and the calculated size stored along the format. Previously the pixel size was only calculated on demand, but that's not possible now. In case such overload is not available, it's possible to pass pixel size manually as well. * In order to support the GL format+type pair, Image, ImageView and Trade::ImageData, there's now an additional untyped formatExtra() field that holds the second value. * The CompressedPixelStorage class is now unconditionally available on all targets, including OpenGL ES and WebGL. However, on OpenGL ES the GL APIs expect that it's all at default values. I attempted to preserve backwards compatibility as much as possible: * The PixelFormat and CompressedPixelFormat enum now contains generic API-independent values. The GL-specific formats are present there, but marked as deprecated. Use either the generic values or GL::PixelFormat (togehter with GL::PixelType) and GL::CompressedPixelFormat instead. There's a lot of ugliness caused by this, but seems to work well. * *Image::type() functions are deprecated as they were too GL-specific. Use formatExtra() and cast it to GL::PixelType instead. * Image constructors take templated format or format+extra arguments, so passing GL-specific values to them should still work.
8 years ago
CORRADE_ASSERT(UnsignedInt(out),
"GL::pixelFormat(): format" << format << "is not supported on this target", {});
return out;
}
PixelType pixelType(const Magnum::PixelFormat format, const UnsignedInt extra) {
GL: removed deprecated aliases to GL functionality in the root namespace. Deprecated for 2018.04, it's been almost a year since. Whoever is using Magnum regularly updated already, and who not can always upgrade gradually (2018.02, 2018.04, 2018.10, 2019.01 etc.).
7 years ago
if(isPixelFormatImplementationSpecific(format)) {
Split the OpenGL layer out, pt 9: generic pixel formats. This is quite big, so: * There are new Magnum::PixelFormat and Magnum::CompressedPixelFormat enums, which contain generic API-independent formats. In particular, PixelFormat replaces GL::PixelFormat and GL::PixelType with a single value. * There's GL::pixelFormat(), GL::pixelType(), GL::compressedPixelFormat() to convert the generic enums to GL-specific. The mapping is only in one direction, done with a lookup table (generic enums are indices to that table). * GL classes taking the formats directly (such as GL::BufferImage) have overloads that take both the GL-specific and generic format. * The generic Image, CompressedImage, ImageView, CompressedImageView, and Trade::ImageData classes now accept the generic formats first-class. However, it's also possible to store an implementation-specific value to cover cases where a generic format enum doesn't have support for a particular format. This is done by wrapping the value using pixelFormatWrap() or compressedPixelFormatWrap(). Particular GPU APIs then assume it's their implementation-specific value and extract the value back using pixelFormatUnwrap() or compressedPixelFormatUnwrap(). There's also an isPixelFormatImplementationSpecific() and isCompressedPixelFormatImplementationSpecific() that distinguishes these values. * Many operations need pixel size and in order to have it even for implementation-specific formats, a corresponding pixelSize() overload is found via ADL on construction and the calculated size stored along the format. Previously the pixel size was only calculated on demand, but that's not possible now. In case such overload is not available, it's possible to pass pixel size manually as well. * In order to support the GL format+type pair, Image, ImageView and Trade::ImageData, there's now an additional untyped formatExtra() field that holds the second value. * The CompressedPixelStorage class is now unconditionally available on all targets, including OpenGL ES and WebGL. However, on OpenGL ES the GL APIs expect that it's all at default values. I attempted to preserve backwards compatibility as much as possible: * The PixelFormat and CompressedPixelFormat enum now contains generic API-independent values. The GL-specific formats are present there, but marked as deprecated. Use either the generic values or GL::PixelFormat (togehter with GL::PixelType) and GL::CompressedPixelFormat instead. There's a lot of ugliness caused by this, but seems to work well. * *Image::type() functions are deprecated as they were too GL-specific. Use formatExtra() and cast it to GL::PixelType instead. * Image constructors take templated format or format+extra arguments, so passing GL-specific values to them should still work.
8 years ago
CORRADE_ASSERT(extra,
"GL::pixelType(): format is implementation-specific, but no additional type specifier was passed", {});
return PixelType(extra);
}
Reserve zero [Compressed]PixelFormat for an invalid value. Catches accidents better -- just look at the diff. Might catch accidents in your code now as well, so beware!
7 years ago
CORRADE_ASSERT(UnsignedInt(format) - 1 < Containers::arraySize(FormatMapping),
Split the OpenGL layer out, pt 9: generic pixel formats. This is quite big, so: * There are new Magnum::PixelFormat and Magnum::CompressedPixelFormat enums, which contain generic API-independent formats. In particular, PixelFormat replaces GL::PixelFormat and GL::PixelType with a single value. * There's GL::pixelFormat(), GL::pixelType(), GL::compressedPixelFormat() to convert the generic enums to GL-specific. The mapping is only in one direction, done with a lookup table (generic enums are indices to that table). * GL classes taking the formats directly (such as GL::BufferImage) have overloads that take both the GL-specific and generic format. * The generic Image, CompressedImage, ImageView, CompressedImageView, and Trade::ImageData classes now accept the generic formats first-class. However, it's also possible to store an implementation-specific value to cover cases where a generic format enum doesn't have support for a particular format. This is done by wrapping the value using pixelFormatWrap() or compressedPixelFormatWrap(). Particular GPU APIs then assume it's their implementation-specific value and extract the value back using pixelFormatUnwrap() or compressedPixelFormatUnwrap(). There's also an isPixelFormatImplementationSpecific() and isCompressedPixelFormatImplementationSpecific() that distinguishes these values. * Many operations need pixel size and in order to have it even for implementation-specific formats, a corresponding pixelSize() overload is found via ADL on construction and the calculated size stored along the format. Previously the pixel size was only calculated on demand, but that's not possible now. In case such overload is not available, it's possible to pass pixel size manually as well. * In order to support the GL format+type pair, Image, ImageView and Trade::ImageData, there's now an additional untyped formatExtra() field that holds the second value. * The CompressedPixelStorage class is now unconditionally available on all targets, including OpenGL ES and WebGL. However, on OpenGL ES the GL APIs expect that it's all at default values. I attempted to preserve backwards compatibility as much as possible: * The PixelFormat and CompressedPixelFormat enum now contains generic API-independent values. The GL-specific formats are present there, but marked as deprecated. Use either the generic values or GL::PixelFormat (togehter with GL::PixelType) and GL::CompressedPixelFormat instead. There's a lot of ugliness caused by this, but seems to work well. * *Image::type() functions are deprecated as they were too GL-specific. Use formatExtra() and cast it to GL::PixelType instead. * Image constructors take templated format or format+extra arguments, so passing GL-specific values to them should still work.
8 years ago
"GL::pixelType(): invalid format" << format, {});
Reserve zero [Compressed]PixelFormat for an invalid value. Catches accidents better -- just look at the diff. Might catch accidents in your code now as well, so beware!
7 years ago
const PixelType out = FormatMapping[UnsignedInt(format) - 1].type;
Split the OpenGL layer out, pt 9: generic pixel formats. This is quite big, so: * There are new Magnum::PixelFormat and Magnum::CompressedPixelFormat enums, which contain generic API-independent formats. In particular, PixelFormat replaces GL::PixelFormat and GL::PixelType with a single value. * There's GL::pixelFormat(), GL::pixelType(), GL::compressedPixelFormat() to convert the generic enums to GL-specific. The mapping is only in one direction, done with a lookup table (generic enums are indices to that table). * GL classes taking the formats directly (such as GL::BufferImage) have overloads that take both the GL-specific and generic format. * The generic Image, CompressedImage, ImageView, CompressedImageView, and Trade::ImageData classes now accept the generic formats first-class. However, it's also possible to store an implementation-specific value to cover cases where a generic format enum doesn't have support for a particular format. This is done by wrapping the value using pixelFormatWrap() or compressedPixelFormatWrap(). Particular GPU APIs then assume it's their implementation-specific value and extract the value back using pixelFormatUnwrap() or compressedPixelFormatUnwrap(). There's also an isPixelFormatImplementationSpecific() and isCompressedPixelFormatImplementationSpecific() that distinguishes these values. * Many operations need pixel size and in order to have it even for implementation-specific formats, a corresponding pixelSize() overload is found via ADL on construction and the calculated size stored along the format. Previously the pixel size was only calculated on demand, but that's not possible now. In case such overload is not available, it's possible to pass pixel size manually as well. * In order to support the GL format+type pair, Image, ImageView and Trade::ImageData, there's now an additional untyped formatExtra() field that holds the second value. * The CompressedPixelStorage class is now unconditionally available on all targets, including OpenGL ES and WebGL. However, on OpenGL ES the GL APIs expect that it's all at default values. I attempted to preserve backwards compatibility as much as possible: * The PixelFormat and CompressedPixelFormat enum now contains generic API-independent values. The GL-specific formats are present there, but marked as deprecated. Use either the generic values or GL::PixelFormat (togehter with GL::PixelType) and GL::CompressedPixelFormat instead. There's a lot of ugliness caused by this, but seems to work well. * *Image::type() functions are deprecated as they were too GL-specific. Use formatExtra() and cast it to GL::PixelType instead. * Image constructors take templated format or format+extra arguments, so passing GL-specific values to them should still work.
8 years ago
CORRADE_ASSERT(UnsignedInt(out),
"GL::pixelType(): format" << format << "is not supported on this target", {});
return out;
}
GL: added hasTextureFormat() and textureFormat() helpers.
7 years ago
TextureFormat textureFormat(const Magnum::PixelFormat format) {
CORRADE_ASSERT(!isPixelFormatImplementationSpecific(format),
"GL::textureFormat(): cannot map an implementation-specific pixel format to an OpenGL texture format", {});
CORRADE_ASSERT(UnsignedInt(format) - 1 < Containers::arraySize(FormatMapping),
"GL::textureFormat(): invalid format" << format, {});
const TextureFormat out = TextureFormatMapping[UnsignedInt(format) - 1];
CORRADE_ASSERT(UnsignedInt(out),
"GL::textureFormat(): format" << format << "is not supported on this target", {});
return out;
}
Rename pixelSize() and other helpers to pixelFormatSize() etc. For consistency with how VertexFormat and other enum helpers are named. The compressedBlockSize() and compressedBlockDataSize() is also renamed to compressedPixelFormatBlockSize() and compressedPixelFormatBlockDataSize(). While backwards compatibility aliases are in place, a breaking change is that Image classes now look for pixelFormatSize() instead of pixelSize(). This is used e.g. when passing GL::PixelFormat / GL::PixelType to the image classes, instead of the generic PixelFormat. While useful, it's unlikely that any project was defining their own pixel format enum and pixelSize() for a D3D or Metal renderer or whatnot, so the breakage should have no practical impact.
4 years ago
UnsignedInt pixelFormatSize(const PixelFormat format, const PixelType type) {
Split the OpenGL layer out, pt 8: move out GL-specific PixelStorage parts. The general part stays in the root namespace, while the GL-specific stuff goes to the GL namespace. Also all GL-specific documentation was moved to relevant APIs in the GL namespace. This finally allows me to build PixelStorage.cpp as part of the root namespace. The PixelStorage::pixelSize() function and PixelStorage::dataProperties() taking a pair of GL::PixelFormat / GL::PixelType enums is deprecated, use GL::pixelSize() and dataProperties() taking pixel size directly instead. A lot of code is still using these, including images; the deprecated aliases are inlined in the header to avoid a compile-time dependency on the GL library.
8 years ago
std::size_t size = 0;
Prefer CORRADE_TARGET_* instead of __GNUC__, __clang__ and _MSVC_VER. While branching on a compiler is rather common, checking a particular compiler version should be needed only rarely. Thus minimize use of such macros to make them easier to grep for.
4 years ago
#ifdef CORRADE_TARGET_GCC
Be strict for missing values in pixel format switches.
7 years ago
#pragma GCC diagnostic push
#pragma GCC diagnostic error "-Wswitch"
#endif
Split the OpenGL layer out, pt 8: move out GL-specific PixelStorage parts. The general part stays in the root namespace, while the GL-specific stuff goes to the GL namespace. Also all GL-specific documentation was moved to relevant APIs in the GL namespace. This finally allows me to build PixelStorage.cpp as part of the root namespace. The PixelStorage::pixelSize() function and PixelStorage::dataProperties() taking a pair of GL::PixelFormat / GL::PixelType enums is deprecated, use GL::pixelSize() and dataProperties() taking pixel size directly instead. A lot of code is still using these, including images; the deprecated aliases are inlined in the header to avoid a compile-time dependency on the GL library.
8 years ago
switch(type) {
case PixelType::UnsignedByte:
#ifndef MAGNUM_TARGET_GLES2
case PixelType::Byte:
#endif
size = 1; break;
case PixelType::UnsignedShort:
GL: EXT_texture_norm16 is not on WebGL 1 anymore. It got changed shortly after the original implementation in 083ecf72b8a3de8b92cd2df2a597722a636c19da to be WebGL 2 only.
5 years ago
#ifndef MAGNUM_TARGET_GLES2
Split the OpenGL layer out, pt 8: move out GL-specific PixelStorage parts. The general part stays in the root namespace, while the GL-specific stuff goes to the GL namespace. Also all GL-specific documentation was moved to relevant APIs in the GL namespace. This finally allows me to build PixelStorage.cpp as part of the root namespace. The PixelStorage::pixelSize() function and PixelStorage::dataProperties() taking a pair of GL::PixelFormat / GL::PixelType enums is deprecated, use GL::pixelSize() and dataProperties() taking pixel size directly instead. A lot of code is still using these, including images; the deprecated aliases are inlined in the header to avoid a compile-time dependency on the GL library.
8 years ago
case PixelType::Short:
#endif
GL: rename PixelType::HalfFloat and Attribute::DataType::HalfFloat to Half. For consistency with the Half type we use elsewhere. The old enums are still available, but deprecated and scheduled for removal.
6 years ago
case PixelType::Half:
Split the OpenGL layer out, pt 8: move out GL-specific PixelStorage parts. The general part stays in the root namespace, while the GL-specific stuff goes to the GL namespace. Also all GL-specific documentation was moved to relevant APIs in the GL namespace. This finally allows me to build PixelStorage.cpp as part of the root namespace. The PixelStorage::pixelSize() function and PixelStorage::dataProperties() taking a pair of GL::PixelFormat / GL::PixelType enums is deprecated, use GL::pixelSize() and dataProperties() taking pixel size directly instead. A lot of code is still using these, including images; the deprecated aliases are inlined in the header to avoid a compile-time dependency on the GL library.
8 years ago
size = 2; break;
case PixelType::UnsignedInt:
#ifndef MAGNUM_TARGET_GLES2
case PixelType::Int:
#endif
case PixelType::Float:
size = 4; break;
#ifndef MAGNUM_TARGET_GLES
case PixelType::UnsignedByte332:
case PixelType::UnsignedByte233Rev:
return 1;
#endif
case PixelType::UnsignedShort565:
#ifndef MAGNUM_TARGET_GLES
case PixelType::UnsignedShort565Rev:
#endif
case PixelType::UnsignedShort4444:
#ifndef MAGNUM_TARGET_WEBGL
case PixelType::UnsignedShort4444Rev:
#endif
case PixelType::UnsignedShort5551:
#ifndef MAGNUM_TARGET_WEBGL
case PixelType::UnsignedShort1555Rev:
#endif
return 2;
#ifndef MAGNUM_TARGET_GLES
case PixelType::UnsignedInt8888:
case PixelType::UnsignedInt8888Rev:
case PixelType::UnsignedInt1010102:
#endif
#if !(defined(MAGNUM_TARGET_WEBGL) && defined(MAGNUM_TARGET_GLES2))
case PixelType::UnsignedInt2101010Rev:
#endif
#ifndef MAGNUM_TARGET_GLES2
case PixelType::UnsignedInt10F11F11FRev:
case PixelType::UnsignedInt5999Rev:
#endif
case PixelType::UnsignedInt248:
return 4;
#ifndef MAGNUM_TARGET_GLES2
case PixelType::Float32UnsignedInt248Rev:
return 8;
#endif
}
Prefer CORRADE_TARGET_* instead of __GNUC__, __clang__ and _MSVC_VER. While branching on a compiler is rather common, checking a particular compiler version should be needed only rarely. Thus minimize use of such macros to make them easier to grep for.
4 years ago
#ifdef CORRADE_TARGET_GCC
Be strict for missing values in pixel format switches.
7 years ago
#pragma GCC diagnostic pop
#endif
Prefer CORRADE_TARGET_* instead of __GNUC__, __clang__ and _MSVC_VER. While branching on a compiler is rather common, checking a particular compiler version should be needed only rarely. Thus minimize use of such macros to make them easier to grep for.
4 years ago
#ifdef CORRADE_TARGET_GCC
Be strict for missing values in pixel format switches.
7 years ago
#pragma GCC diagnostic push
#pragma GCC diagnostic error "-Wswitch"
#endif
Split the OpenGL layer out, pt 8: move out GL-specific PixelStorage parts. The general part stays in the root namespace, while the GL-specific stuff goes to the GL namespace. Also all GL-specific documentation was moved to relevant APIs in the GL namespace. This finally allows me to build PixelStorage.cpp as part of the root namespace. The PixelStorage::pixelSize() function and PixelStorage::dataProperties() taking a pair of GL::PixelFormat / GL::PixelType enums is deprecated, use GL::pixelSize() and dataProperties() taking pixel size directly instead. A lot of code is still using these, including images; the deprecated aliases are inlined in the header to avoid a compile-time dependency on the GL library.
8 years ago
switch(format) {
#if !(defined(MAGNUM_TARGET_WEBGL) && defined(MAGNUM_TARGET_GLES2))
case PixelFormat::Red:
#endif
#ifndef MAGNUM_TARGET_GLES2
case PixelFormat::RedInteger:
#endif
#ifndef MAGNUM_TARGET_GLES
case PixelFormat::Green:
case PixelFormat::Blue:
case PixelFormat::GreenInteger:
case PixelFormat::BlueInteger:
#endif
#ifdef MAGNUM_TARGET_GLES2
case PixelFormat::Luminance:
#endif
case PixelFormat::DepthComponent:
#ifndef MAGNUM_TARGET_WEBGL
case PixelFormat::StencilIndex:
#endif
return 1*size;
#if !(defined(MAGNUM_TARGET_WEBGL) && defined(MAGNUM_TARGET_GLES2))
case PixelFormat::RG:
#endif
#ifndef MAGNUM_TARGET_GLES2
case PixelFormat::RGInteger:
#endif
#ifdef MAGNUM_TARGET_GLES2
case PixelFormat::LuminanceAlpha:
#endif
return 2*size;
case PixelFormat::RGB:
#ifndef MAGNUM_TARGET_GLES2
case PixelFormat::RGBInteger:
#endif
#ifndef MAGNUM_TARGET_GLES
case PixelFormat::BGR:
case PixelFormat::BGRInteger:
#endif
#ifdef MAGNUM_TARGET_GLES2
case PixelFormat::SRGB:
#endif
return 3*size;
case PixelFormat::RGBA:
#ifndef MAGNUM_TARGET_GLES2
case PixelFormat::RGBAInteger:
#endif
#ifndef MAGNUM_TARGET_WEBGL
case PixelFormat::BGRA:
#endif
#ifdef MAGNUM_TARGET_GLES2
case PixelFormat::SRGBAlpha:
#endif
#ifndef MAGNUM_TARGET_GLES
case PixelFormat::BGRAInteger:
#endif
return 4*size;
/* Handled above */
case PixelFormat::DepthStencil:
Rename pixelSize() and other helpers to pixelFormatSize() etc. For consistency with how VertexFormat and other enum helpers are named. The compressedBlockSize() and compressedBlockDataSize() is also renamed to compressedPixelFormatBlockSize() and compressedPixelFormatBlockDataSize(). While backwards compatibility aliases are in place, a breaking change is that Image classes now look for pixelFormatSize() instead of pixelSize(). This is used e.g. when passing GL::PixelFormat / GL::PixelType to the image classes, instead of the generic PixelFormat. While useful, it's unlikely that any project was defining their own pixel format enum and pixelSize() for a D3D or Metal renderer or whatnot, so the breakage should have no practical impact.
4 years ago
CORRADE_ASSERT_UNREACHABLE("GL::pixelFormatSize(): invalid" << type << "specified for" << format, 0);
Split the OpenGL layer out, pt 8: move out GL-specific PixelStorage parts. The general part stays in the root namespace, while the GL-specific stuff goes to the GL namespace. Also all GL-specific documentation was moved to relevant APIs in the GL namespace. This finally allows me to build PixelStorage.cpp as part of the root namespace. The PixelStorage::pixelSize() function and PixelStorage::dataProperties() taking a pair of GL::PixelFormat / GL::PixelType enums is deprecated, use GL::pixelSize() and dataProperties() taking pixel size directly instead. A lot of code is still using these, including images; the deprecated aliases are inlined in the header to avoid a compile-time dependency on the GL library.
8 years ago
}
Prefer CORRADE_TARGET_* instead of __GNUC__, __clang__ and _MSVC_VER. While branching on a compiler is rather common, checking a particular compiler version should be needed only rarely. Thus minimize use of such macros to make them easier to grep for.
4 years ago
#ifdef CORRADE_TARGET_GCC
Be strict for missing values in pixel format switches.
7 years ago
#pragma GCC diagnostic pop
#endif
Split the OpenGL layer out, pt 8: move out GL-specific PixelStorage parts. The general part stays in the root namespace, while the GL-specific stuff goes to the GL namespace. Also all GL-specific documentation was moved to relevant APIs in the GL namespace. This finally allows me to build PixelStorage.cpp as part of the root namespace. The PixelStorage::pixelSize() function and PixelStorage::dataProperties() taking a pair of GL::PixelFormat / GL::PixelType enums is deprecated, use GL::pixelSize() and dataProperties() taking pixel size directly instead. A lot of code is still using these, including images; the deprecated aliases are inlined in the header to avoid a compile-time dependency on the GL library.
8 years ago
Adapted to Corrade changes.
6 years ago
CORRADE_INTERNAL_ASSERT_UNREACHABLE(); /* LCOV_EXCL_LINE */
Split the OpenGL layer out, pt 8: move out GL-specific PixelStorage parts. The general part stays in the root namespace, while the GL-specific stuff goes to the GL namespace. Also all GL-specific documentation was moved to relevant APIs in the GL namespace. This finally allows me to build PixelStorage.cpp as part of the root namespace. The PixelStorage::pixelSize() function and PixelStorage::dataProperties() taking a pair of GL::PixelFormat / GL::PixelType enums is deprecated, use GL::pixelSize() and dataProperties() taking pixel size directly instead. A lot of code is still using these, including images; the deprecated aliases are inlined in the header to avoid a compile-time dependency on the GL library.
8 years ago
}
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
#ifndef DOXYGEN_GENERATING_OUTPUT
Use new-style debug operators everywhere.
11 years ago
Debug& operator<<(Debug& debug, const PixelFormat value) {
Reduce string duplication in enum debug output operators. Bloaty says it saved 10 kB in Debug build of MagnumGL: VM SIZE FILE SIZE -------------- -------------- [ = ] 0 .debug_info +1.59Ki +0.0% +0.4% +1.50Ki .text +1.50Ki +0.4% [ = ] 0 .debug_str +409 +0.0% [ = ] 0 .debug_line +276 +0.1% [ = ] 0 .debug_abbrev +20 +0.0% -28.6% -2 [LOAD [RX]] -2 -28.6% [ = ] 0 [Unmapped] -4.28Ki -41.0% -22.7% -9.23Ki .rodata -9.23Ki -22.7% -0.8% -7.73Ki TOTAL -9.73Ki -0.1% And 4 kB in Release: VM SIZE FILE SIZE -------------- -------------- +1.1% +3.44Ki .text +3.44Ki +1.1% +1.7% +1.39Ki .eh_frame +1.39Ki +1.7% [ = ] 0 [Unmapped] +656 +51% -25.5% -9.47Ki .rodata -9.47Ki -25.5% -0.7% -4.64Ki TOTAL -4.00Ki -0.4% That's not negative, so I guess that's good. This change is of course more significant in the context of a minimal WebGL build, where the exe can be as little as 50 kB -- there 4 kB is almost 10% of the size.
7 years ago
debug << "GL::PixelFormat" << Debug::nospace;
Prefer CORRADE_TARGET_* instead of __GNUC__, __clang__ and _MSVC_VER. While branching on a compiler is rather common, checking a particular compiler version should be needed only rarely. Thus minimize use of such macros to make them easier to grep for.
4 years ago
#ifdef CORRADE_TARGET_GCC
Be strict for missing values in pixel format switches.
7 years ago
#pragma GCC diagnostic push
#pragma GCC diagnostic error "-Wswitch"
#endif
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
switch(value) {
Exclude debug operators from code coverage.
10 years ago
/* LCOV_EXCL_START */
Reduce string duplication in enum debug output operators. Bloaty says it saved 10 kB in Debug build of MagnumGL: VM SIZE FILE SIZE -------------- -------------- [ = ] 0 .debug_info +1.59Ki +0.0% +0.4% +1.50Ki .text +1.50Ki +0.4% [ = ] 0 .debug_str +409 +0.0% [ = ] 0 .debug_line +276 +0.1% [ = ] 0 .debug_abbrev +20 +0.0% -28.6% -2 [LOAD [RX]] -2 -28.6% [ = ] 0 [Unmapped] -4.28Ki -41.0% -22.7% -9.23Ki .rodata -9.23Ki -22.7% -0.8% -7.73Ki TOTAL -9.73Ki -0.1% And 4 kB in Release: VM SIZE FILE SIZE -------------- -------------- +1.1% +3.44Ki .text +3.44Ki +1.1% +1.7% +1.39Ki .eh_frame +1.39Ki +1.7% [ = ] 0 [Unmapped] +656 +51% -25.5% -9.47Ki .rodata -9.47Ki -25.5% -0.7% -4.64Ki TOTAL -4.00Ki -0.4% That's not negative, so I guess that's good. This change is of course more significant in the context of a minimal WebGL build, where the exe can be as little as 50 kB -- there 4 kB is almost 10% of the size.
7 years ago
#define _c(value) case PixelFormat::value: return debug << "::" #value;
First-class WebGL support, part 7: reduced color formats.
11 years ago
#if !(defined(MAGNUM_TARGET_WEBGL) && defined(MAGNUM_TARGET_GLES2))
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
_c(Red)
First-class WebGL support, part 7: reduced color formats.
11 years ago
#endif
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
#ifndef MAGNUM_TARGET_GLES
_c(Green)
_c(Blue)
#endif
Added ES2-only support for GL_LUMINANCE{,_ALPHA}. It is deprecated, but many ES2 implementations don't support EXT_texture_rg, thus this is the only way to have single- and two-component textures without wasting precious memory. The enum value isn't exposed on desktop OpenGL and ES3. GL_ALPHA is not supported, as it doesn't bring any new functionality (it is also single-component and thus can be interchanged with GL_LUMINANCE).
13 years ago
#ifdef MAGNUM_TARGET_GLES2
_c(Luminance)
#endif
First-class WebGL support, part 7: reduced color formats.
11 years ago
#if !(defined(MAGNUM_TARGET_WEBGL) && defined(MAGNUM_TARGET_GLES2))
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
_c(RG)
First-class WebGL support, part 7: reduced color formats.
11 years ago
#endif
Added ES2-only support for GL_LUMINANCE{,_ALPHA}. It is deprecated, but many ES2 implementations don't support EXT_texture_rg, thus this is the only way to have single- and two-component textures without wasting precious memory. The enum value isn't exposed on desktop OpenGL and ES3. GL_ALPHA is not supported, as it doesn't bring any new functionality (it is also single-component and thus can be interchanged with GL_LUMINANCE).
13 years ago
#ifdef MAGNUM_TARGET_GLES2
_c(LuminanceAlpha)
#endif
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
_c(RGB)
_c(RGBA)
#ifndef MAGNUM_TARGET_GLES
_c(BGR)
#endif
First-class WebGL support, part 7: reduced color formats.
11 years ago
#ifndef MAGNUM_TARGET_WEBGL
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
_c(BGRA)
First-class WebGL support, part 7: reduced color formats.
11 years ago
#endif
Fix the ability to create sRGB textures on ES2/WebGL1. Since 98a676ef653fc956b375712bc7765e622a6dd2e9, on ES2 and WebGL1 the Texture::setStorage() emulation passes the pixel format to both <format> and <internalFormat> of glTexImage() APIs. On desktop the go-to way to create a sRGB texture is by passing GL_SRGB to <internalFormat> and GL_RGB to <format>, but here GL_RGB was passed to both and thus the information about sRGB was lost. With the new PixelFormat::SRGB and PixelFormat::SRGBAlpha enums that are present only on ES2/WebGL1 this case is fixed -- sRGB texture format will get translated to sRGB pixel format and that used for both <format> and <internalFormat>. Another case is when EXT_texture_storage is available -- passing unsized GL_SRGB_EXT or GL_SRGB_ALPHA_EXT to glTexStorageEXT() is an error and there's apparently no mention of this in any extension, making it impossible to create sRGB textures using EXT_texture_storage. I bit the bullet and tried passing the (numerical value of) GL_SRGB8 and GL_SRGB8_ALPHA8 to it. At least on my NV it worked, so I enabled these two in TextureFormat for ES2. No EXT_texture_storage is on WebGL1, so they are only on ES2. These two sized TextureFormat::SRGB8 and TextureFormat::SRGB8Alpha8 formats are translated to GL_SRGB and GL_SRGB_ALPHA and so using them unconditionally for all platforms (except WebGL1) "just works".
9 years ago
#ifdef MAGNUM_TARGET_GLES2
_c(SRGB)
_c(SRGBAlpha)
#endif
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
#ifndef MAGNUM_TARGET_GLES2
_c(RedInteger)
#ifndef MAGNUM_TARGET_GLES
_c(GreenInteger)
_c(BlueInteger)
#endif
_c(RGInteger)
_c(RGBInteger)
_c(RGBAInteger)
#ifndef MAGNUM_TARGET_GLES
_c(BGRInteger)
_c(BGRAInteger)
#endif
#endif
_c(DepthComponent)
First-class WebGL support, part 7: reduced color formats.
11 years ago
#ifndef MAGNUM_TARGET_WEBGL
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
_c(StencilIndex)
First-class WebGL support, part 7: reduced color formats.
11 years ago
#endif
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
_c(DepthStencil)
#undef _c
Exclude debug operators from code coverage.
10 years ago
/* LCOV_EXCL_STOP */
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
}
Prefer CORRADE_TARGET_* instead of __GNUC__, __clang__ and _MSVC_VER. While branching on a compiler is rather common, checking a particular compiler version should be needed only rarely. Thus minimize use of such macros to make them easier to grep for.
4 years ago
#ifdef CORRADE_TARGET_GCC
Be strict for missing values in pixel format switches.
7 years ago
#pragma GCC diagnostic pop
#endif
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
Reduce string duplication in enum debug output operators. Bloaty says it saved 10 kB in Debug build of MagnumGL: VM SIZE FILE SIZE -------------- -------------- [ = ] 0 .debug_info +1.59Ki +0.0% +0.4% +1.50Ki .text +1.50Ki +0.4% [ = ] 0 .debug_str +409 +0.0% [ = ] 0 .debug_line +276 +0.1% [ = ] 0 .debug_abbrev +20 +0.0% -28.6% -2 [LOAD [RX]] -2 -28.6% [ = ] 0 [Unmapped] -4.28Ki -41.0% -22.7% -9.23Ki .rodata -9.23Ki -22.7% -0.8% -7.73Ki TOTAL -9.73Ki -0.1% And 4 kB in Release: VM SIZE FILE SIZE -------------- -------------- +1.1% +3.44Ki .text +3.44Ki +1.1% +1.7% +1.39Ki .eh_frame +1.39Ki +1.7% [ = ] 0 [Unmapped] +656 +51% -25.5% -9.47Ki .rodata -9.47Ki -25.5% -0.7% -4.64Ki TOTAL -4.00Ki -0.4% That's not negative, so I guess that's good. This change is of course more significant in the context of a minimal WebGL build, where the exe can be as little as 50 kB -- there 4 kB is almost 10% of the size.
7 years ago
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
}
Use new-style debug operators everywhere.
11 years ago
Debug& operator<<(Debug& debug, const PixelType value) {
Reduce string duplication in enum debug output operators. Bloaty says it saved 10 kB in Debug build of MagnumGL: VM SIZE FILE SIZE -------------- -------------- [ = ] 0 .debug_info +1.59Ki +0.0% +0.4% +1.50Ki .text +1.50Ki +0.4% [ = ] 0 .debug_str +409 +0.0% [ = ] 0 .debug_line +276 +0.1% [ = ] 0 .debug_abbrev +20 +0.0% -28.6% -2 [LOAD [RX]] -2 -28.6% [ = ] 0 [Unmapped] -4.28Ki -41.0% -22.7% -9.23Ki .rodata -9.23Ki -22.7% -0.8% -7.73Ki TOTAL -9.73Ki -0.1% And 4 kB in Release: VM SIZE FILE SIZE -------------- -------------- +1.1% +3.44Ki .text +3.44Ki +1.1% +1.7% +1.39Ki .eh_frame +1.39Ki +1.7% [ = ] 0 [Unmapped] +656 +51% -25.5% -9.47Ki .rodata -9.47Ki -25.5% -0.7% -4.64Ki TOTAL -4.00Ki -0.4% That's not negative, so I guess that's good. This change is of course more significant in the context of a minimal WebGL build, where the exe can be as little as 50 kB -- there 4 kB is almost 10% of the size.
7 years ago
debug << "GL::PixelType" << Debug::nospace;
Prefer CORRADE_TARGET_* instead of __GNUC__, __clang__ and _MSVC_VER. While branching on a compiler is rather common, checking a particular compiler version should be needed only rarely. Thus minimize use of such macros to make them easier to grep for.
4 years ago
#ifdef CORRADE_TARGET_GCC
Be strict for missing values in pixel format switches.
7 years ago
#pragma GCC diagnostic push
#pragma GCC diagnostic error "-Wswitch"
#endif
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
switch(value) {
Exclude debug operators from code coverage.
10 years ago
/* LCOV_EXCL_START */
Reduce string duplication in enum debug output operators. Bloaty says it saved 10 kB in Debug build of MagnumGL: VM SIZE FILE SIZE -------------- -------------- [ = ] 0 .debug_info +1.59Ki +0.0% +0.4% +1.50Ki .text +1.50Ki +0.4% [ = ] 0 .debug_str +409 +0.0% [ = ] 0 .debug_line +276 +0.1% [ = ] 0 .debug_abbrev +20 +0.0% -28.6% -2 [LOAD [RX]] -2 -28.6% [ = ] 0 [Unmapped] -4.28Ki -41.0% -22.7% -9.23Ki .rodata -9.23Ki -22.7% -0.8% -7.73Ki TOTAL -9.73Ki -0.1% And 4 kB in Release: VM SIZE FILE SIZE -------------- -------------- +1.1% +3.44Ki .text +3.44Ki +1.1% +1.7% +1.39Ki .eh_frame +1.39Ki +1.7% [ = ] 0 [Unmapped] +656 +51% -25.5% -9.47Ki .rodata -9.47Ki -25.5% -0.7% -4.64Ki TOTAL -4.00Ki -0.4% That's not negative, so I guess that's good. This change is of course more significant in the context of a minimal WebGL build, where the exe can be as little as 50 kB -- there 4 kB is almost 10% of the size.
7 years ago
#define _c(value) case PixelType::value: return debug << "::" #value;
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
_c(UnsignedByte)
#ifndef MAGNUM_TARGET_GLES2
_c(Byte)
#endif
_c(UnsignedShort)
GL: EXT_texture_norm16 is not on WebGL 1 anymore. It got changed shortly after the original implementation in 083ecf72b8a3de8b92cd2df2a597722a636c19da to be WebGL 2 only.
5 years ago
#ifndef MAGNUM_TARGET_GLES2
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
_c(Short)
#endif
_c(UnsignedInt)
#ifndef MAGNUM_TARGET_GLES2
_c(Int)
#endif
GL: rename PixelType::HalfFloat and Attribute::DataType::HalfFloat to Half. For consistency with the Half type we use elsewhere. The old enums are still available, but deprecated and scheduled for removal.
6 years ago
_c(Half)
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
_c(Float)
#ifndef MAGNUM_TARGET_GLES
_c(UnsignedByte332)
_c(UnsignedByte233Rev)
#endif
_c(UnsignedShort565)
#ifndef MAGNUM_TARGET_GLES
_c(UnsignedShort565Rev)
#endif
_c(UnsignedShort4444)
First-class WebGL support, part 7: reduced color formats.
11 years ago
#ifndef MAGNUM_TARGET_WEBGL
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
_c(UnsignedShort4444Rev)
First-class WebGL support, part 7: reduced color formats.
11 years ago
#endif
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
_c(UnsignedShort5551)
First-class WebGL support, part 7: reduced color formats.
11 years ago
#ifndef MAGNUM_TARGET_WEBGL
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
_c(UnsignedShort1555Rev)
First-class WebGL support, part 7: reduced color formats.
11 years ago
#endif
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
#ifndef MAGNUM_TARGET_GLES
_c(UnsignedInt8888)
_c(UnsignedInt8888Rev)
_c(UnsignedInt1010102)
#endif
First-class WebGL support, part 7: reduced color formats.
11 years ago
#if !(defined(MAGNUM_TARGET_WEBGL) && defined(MAGNUM_TARGET_GLES2))
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
_c(UnsignedInt2101010Rev)
First-class WebGL support, part 7: reduced color formats.
11 years ago
#endif
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
#ifndef MAGNUM_TARGET_GLES2
_c(UnsignedInt10F11F11FRev)
_c(UnsignedInt5999Rev)
#endif
_c(UnsignedInt248)
#ifndef MAGNUM_TARGET_GLES2
_c(Float32UnsignedInt248Rev)
#endif
#undef _c
Exclude debug operators from code coverage.
10 years ago
/* LCOV_EXCL_STOP */
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
}
Prefer CORRADE_TARGET_* instead of __GNUC__, __clang__ and _MSVC_VER. While branching on a compiler is rather common, checking a particular compiler version should be needed only rarely. Thus minimize use of such macros to make them easier to grep for.
4 years ago
#ifdef CORRADE_TARGET_GCC
Be strict for missing values in pixel format switches.
7 years ago
#pragma GCC diagnostic pop
#endif
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
Reduce string duplication in enum debug output operators. Bloaty says it saved 10 kB in Debug build of MagnumGL: VM SIZE FILE SIZE -------------- -------------- [ = ] 0 .debug_info +1.59Ki +0.0% +0.4% +1.50Ki .text +1.50Ki +0.4% [ = ] 0 .debug_str +409 +0.0% [ = ] 0 .debug_line +276 +0.1% [ = ] 0 .debug_abbrev +20 +0.0% -28.6% -2 [LOAD [RX]] -2 -28.6% [ = ] 0 [Unmapped] -4.28Ki -41.0% -22.7% -9.23Ki .rodata -9.23Ki -22.7% -0.8% -7.73Ki TOTAL -9.73Ki -0.1% And 4 kB in Release: VM SIZE FILE SIZE -------------- -------------- +1.1% +3.44Ki .text +3.44Ki +1.1% +1.7% +1.39Ki .eh_frame +1.39Ki +1.7% [ = ] 0 [Unmapped] +656 +51% -25.5% -9.47Ki .rodata -9.47Ki -25.5% -0.7% -4.64Ki TOTAL -4.00Ki -0.4% That's not negative, so I guess that's good. This change is of course more significant in the context of a minimal WebGL build, where the exe can be as little as 50 kB -- there 4 kB is almost 10% of the size.
7 years ago
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
}
Compressed image support, part 3: added CompressedColorFormat enum.
11 years ago
Split the OpenGL layer out, pt 9: generic pixel formats. This is quite big, so: * There are new Magnum::PixelFormat and Magnum::CompressedPixelFormat enums, which contain generic API-independent formats. In particular, PixelFormat replaces GL::PixelFormat and GL::PixelType with a single value. * There's GL::pixelFormat(), GL::pixelType(), GL::compressedPixelFormat() to convert the generic enums to GL-specific. The mapping is only in one direction, done with a lookup table (generic enums are indices to that table). * GL classes taking the formats directly (such as GL::BufferImage) have overloads that take both the GL-specific and generic format. * The generic Image, CompressedImage, ImageView, CompressedImageView, and Trade::ImageData classes now accept the generic formats first-class. However, it's also possible to store an implementation-specific value to cover cases where a generic format enum doesn't have support for a particular format. This is done by wrapping the value using pixelFormatWrap() or compressedPixelFormatWrap(). Particular GPU APIs then assume it's their implementation-specific value and extract the value back using pixelFormatUnwrap() or compressedPixelFormatUnwrap(). There's also an isPixelFormatImplementationSpecific() and isCompressedPixelFormatImplementationSpecific() that distinguishes these values. * Many operations need pixel size and in order to have it even for implementation-specific formats, a corresponding pixelSize() overload is found via ADL on construction and the calculated size stored along the format. Previously the pixel size was only calculated on demand, but that's not possible now. In case such overload is not available, it's possible to pass pixel size manually as well. * In order to support the GL format+type pair, Image, ImageView and Trade::ImageData, there's now an additional untyped formatExtra() field that holds the second value. * The CompressedPixelStorage class is now unconditionally available on all targets, including OpenGL ES and WebGL. However, on OpenGL ES the GL APIs expect that it's all at default values. I attempted to preserve backwards compatibility as much as possible: * The PixelFormat and CompressedPixelFormat enum now contains generic API-independent values. The GL-specific formats are present there, but marked as deprecated. Use either the generic values or GL::PixelFormat (togehter with GL::PixelType) and GL::CompressedPixelFormat instead. There's a lot of ugliness caused by this, but seems to work well. * *Image::type() functions are deprecated as they were too GL-specific. Use formatExtra() and cast it to GL::PixelType instead. * Image constructors take templated format or format+extra arguments, so passing GL-specific values to them should still work.
8 years ago
namespace {
#ifndef DOXYGEN_GENERATING_OUTPUT /* It gets *really* confused */
GL: added hasTextureFormat() and textureFormat() helpers.
7 years ago
/* Enum values are the same between CompressedPixelFormat and TextureFormat, so
having just a single table for both */
Split the OpenGL layer out, pt 9: generic pixel formats. This is quite big, so: * There are new Magnum::PixelFormat and Magnum::CompressedPixelFormat enums, which contain generic API-independent formats. In particular, PixelFormat replaces GL::PixelFormat and GL::PixelType with a single value. * There's GL::pixelFormat(), GL::pixelType(), GL::compressedPixelFormat() to convert the generic enums to GL-specific. The mapping is only in one direction, done with a lookup table (generic enums are indices to that table). * GL classes taking the formats directly (such as GL::BufferImage) have overloads that take both the GL-specific and generic format. * The generic Image, CompressedImage, ImageView, CompressedImageView, and Trade::ImageData classes now accept the generic formats first-class. However, it's also possible to store an implementation-specific value to cover cases where a generic format enum doesn't have support for a particular format. This is done by wrapping the value using pixelFormatWrap() or compressedPixelFormatWrap(). Particular GPU APIs then assume it's their implementation-specific value and extract the value back using pixelFormatUnwrap() or compressedPixelFormatUnwrap(). There's also an isPixelFormatImplementationSpecific() and isCompressedPixelFormatImplementationSpecific() that distinguishes these values. * Many operations need pixel size and in order to have it even for implementation-specific formats, a corresponding pixelSize() overload is found via ADL on construction and the calculated size stored along the format. Previously the pixel size was only calculated on demand, but that's not possible now. In case such overload is not available, it's possible to pass pixel size manually as well. * In order to support the GL format+type pair, Image, ImageView and Trade::ImageData, there's now an additional untyped formatExtra() field that holds the second value. * The CompressedPixelStorage class is now unconditionally available on all targets, including OpenGL ES and WebGL. However, on OpenGL ES the GL APIs expect that it's all at default values. I attempted to preserve backwards compatibility as much as possible: * The PixelFormat and CompressedPixelFormat enum now contains generic API-independent values. The GL-specific formats are present there, but marked as deprecated. Use either the generic values or GL::PixelFormat (togehter with GL::PixelType) and GL::CompressedPixelFormat instead. There's a lot of ugliness caused by this, but seems to work well. * *Image::type() functions are deprecated as they were too GL-specific. Use formatExtra() and cast it to GL::PixelType instead. * Image constructors take templated format or format+extra arguments, so passing GL-specific values to them should still work.
8 years ago
constexpr CompressedPixelFormat CompressedFormatMapping[] {
GL: added hasTextureFormat() and textureFormat() helpers.
7 years ago
#define _c(input, format) CompressedPixelFormat::format,
#define _s(input) CompressedPixelFormat{},
Split the OpenGL layer out, pt 9: generic pixel formats. This is quite big, so: * There are new Magnum::PixelFormat and Magnum::CompressedPixelFormat enums, which contain generic API-independent formats. In particular, PixelFormat replaces GL::PixelFormat and GL::PixelType with a single value. * There's GL::pixelFormat(), GL::pixelType(), GL::compressedPixelFormat() to convert the generic enums to GL-specific. The mapping is only in one direction, done with a lookup table (generic enums are indices to that table). * GL classes taking the formats directly (such as GL::BufferImage) have overloads that take both the GL-specific and generic format. * The generic Image, CompressedImage, ImageView, CompressedImageView, and Trade::ImageData classes now accept the generic formats first-class. However, it's also possible to store an implementation-specific value to cover cases where a generic format enum doesn't have support for a particular format. This is done by wrapping the value using pixelFormatWrap() or compressedPixelFormatWrap(). Particular GPU APIs then assume it's their implementation-specific value and extract the value back using pixelFormatUnwrap() or compressedPixelFormatUnwrap(). There's also an isPixelFormatImplementationSpecific() and isCompressedPixelFormatImplementationSpecific() that distinguishes these values. * Many operations need pixel size and in order to have it even for implementation-specific formats, a corresponding pixelSize() overload is found via ADL on construction and the calculated size stored along the format. Previously the pixel size was only calculated on demand, but that's not possible now. In case such overload is not available, it's possible to pass pixel size manually as well. * In order to support the GL format+type pair, Image, ImageView and Trade::ImageData, there's now an additional untyped formatExtra() field that holds the second value. * The CompressedPixelStorage class is now unconditionally available on all targets, including OpenGL ES and WebGL. However, on OpenGL ES the GL APIs expect that it's all at default values. I attempted to preserve backwards compatibility as much as possible: * The PixelFormat and CompressedPixelFormat enum now contains generic API-independent values. The GL-specific formats are present there, but marked as deprecated. Use either the generic values or GL::PixelFormat (togehter with GL::PixelType) and GL::CompressedPixelFormat instead. There's a lot of ugliness caused by this, but seems to work well. * *Image::type() functions are deprecated as they were too GL-specific. Use formatExtra() and cast it to GL::PixelType instead. * Image constructors take templated format or format+extra arguments, so passing GL-specific values to them should still work.
8 years ago
#include "Magnum/GL/Implementation/compressedPixelFormatMapping.hpp"
#undef _s
#undef _c
};
#endif
}
bool hasCompressedPixelFormat(const Magnum::CompressedPixelFormat format) {
if(isCompressedPixelFormatImplementationSpecific(format))
return true;
Reserve zero [Compressed]PixelFormat for an invalid value. Catches accidents better -- just look at the diff. Might catch accidents in your code now as well, so beware!
7 years ago
CORRADE_ASSERT(UnsignedInt(format) - 1 < Containers::arraySize(CompressedFormatMapping),
Split the OpenGL layer out, pt 9: generic pixel formats. This is quite big, so: * There are new Magnum::PixelFormat and Magnum::CompressedPixelFormat enums, which contain generic API-independent formats. In particular, PixelFormat replaces GL::PixelFormat and GL::PixelType with a single value. * There's GL::pixelFormat(), GL::pixelType(), GL::compressedPixelFormat() to convert the generic enums to GL-specific. The mapping is only in one direction, done with a lookup table (generic enums are indices to that table). * GL classes taking the formats directly (such as GL::BufferImage) have overloads that take both the GL-specific and generic format. * The generic Image, CompressedImage, ImageView, CompressedImageView, and Trade::ImageData classes now accept the generic formats first-class. However, it's also possible to store an implementation-specific value to cover cases where a generic format enum doesn't have support for a particular format. This is done by wrapping the value using pixelFormatWrap() or compressedPixelFormatWrap(). Particular GPU APIs then assume it's their implementation-specific value and extract the value back using pixelFormatUnwrap() or compressedPixelFormatUnwrap(). There's also an isPixelFormatImplementationSpecific() and isCompressedPixelFormatImplementationSpecific() that distinguishes these values. * Many operations need pixel size and in order to have it even for implementation-specific formats, a corresponding pixelSize() overload is found via ADL on construction and the calculated size stored along the format. Previously the pixel size was only calculated on demand, but that's not possible now. In case such overload is not available, it's possible to pass pixel size manually as well. * In order to support the GL format+type pair, Image, ImageView and Trade::ImageData, there's now an additional untyped formatExtra() field that holds the second value. * The CompressedPixelStorage class is now unconditionally available on all targets, including OpenGL ES and WebGL. However, on OpenGL ES the GL APIs expect that it's all at default values. I attempted to preserve backwards compatibility as much as possible: * The PixelFormat and CompressedPixelFormat enum now contains generic API-independent values. The GL-specific formats are present there, but marked as deprecated. Use either the generic values or GL::PixelFormat (togehter with GL::PixelType) and GL::CompressedPixelFormat instead. There's a lot of ugliness caused by this, but seems to work well. * *Image::type() functions are deprecated as they were too GL-specific. Use formatExtra() and cast it to GL::PixelType instead. * Image constructors take templated format or format+extra arguments, so passing GL-specific values to them should still work.
8 years ago
"GL::hasCompressedPixelFormat(): invalid format" << format, {});
Reserve zero [Compressed]PixelFormat for an invalid value. Catches accidents better -- just look at the diff. Might catch accidents in your code now as well, so beware!
7 years ago
return UnsignedInt(CompressedFormatMapping[UnsignedInt(format) - 1]);
Split the OpenGL layer out, pt 9: generic pixel formats. This is quite big, so: * There are new Magnum::PixelFormat and Magnum::CompressedPixelFormat enums, which contain generic API-independent formats. In particular, PixelFormat replaces GL::PixelFormat and GL::PixelType with a single value. * There's GL::pixelFormat(), GL::pixelType(), GL::compressedPixelFormat() to convert the generic enums to GL-specific. The mapping is only in one direction, done with a lookup table (generic enums are indices to that table). * GL classes taking the formats directly (such as GL::BufferImage) have overloads that take both the GL-specific and generic format. * The generic Image, CompressedImage, ImageView, CompressedImageView, and Trade::ImageData classes now accept the generic formats first-class. However, it's also possible to store an implementation-specific value to cover cases where a generic format enum doesn't have support for a particular format. This is done by wrapping the value using pixelFormatWrap() or compressedPixelFormatWrap(). Particular GPU APIs then assume it's their implementation-specific value and extract the value back using pixelFormatUnwrap() or compressedPixelFormatUnwrap(). There's also an isPixelFormatImplementationSpecific() and isCompressedPixelFormatImplementationSpecific() that distinguishes these values. * Many operations need pixel size and in order to have it even for implementation-specific formats, a corresponding pixelSize() overload is found via ADL on construction and the calculated size stored along the format. Previously the pixel size was only calculated on demand, but that's not possible now. In case such overload is not available, it's possible to pass pixel size manually as well. * In order to support the GL format+type pair, Image, ImageView and Trade::ImageData, there's now an additional untyped formatExtra() field that holds the second value. * The CompressedPixelStorage class is now unconditionally available on all targets, including OpenGL ES and WebGL. However, on OpenGL ES the GL APIs expect that it's all at default values. I attempted to preserve backwards compatibility as much as possible: * The PixelFormat and CompressedPixelFormat enum now contains generic API-independent values. The GL-specific formats are present there, but marked as deprecated. Use either the generic values or GL::PixelFormat (togehter with GL::PixelType) and GL::CompressedPixelFormat instead. There's a lot of ugliness caused by this, but seems to work well. * *Image::type() functions are deprecated as they were too GL-specific. Use formatExtra() and cast it to GL::PixelType instead. * Image constructors take templated format or format+extra arguments, so passing GL-specific values to them should still work.
8 years ago
}
GL: added hasTextureFormat() and textureFormat() helpers.
7 years ago
bool hasTextureFormat(const Magnum::CompressedPixelFormat format) {
if(isCompressedPixelFormatImplementationSpecific(format))
return true;
CORRADE_ASSERT(UnsignedInt(format) - 1 < Containers::arraySize(CompressedFormatMapping),
"GL::hasTextureFormat(): invalid format" << format, {});
return UnsignedInt(CompressedFormatMapping[UnsignedInt(format) - 1]);
}
Split the OpenGL layer out, pt 9: generic pixel formats. This is quite big, so: * There are new Magnum::PixelFormat and Magnum::CompressedPixelFormat enums, which contain generic API-independent formats. In particular, PixelFormat replaces GL::PixelFormat and GL::PixelType with a single value. * There's GL::pixelFormat(), GL::pixelType(), GL::compressedPixelFormat() to convert the generic enums to GL-specific. The mapping is only in one direction, done with a lookup table (generic enums are indices to that table). * GL classes taking the formats directly (such as GL::BufferImage) have overloads that take both the GL-specific and generic format. * The generic Image, CompressedImage, ImageView, CompressedImageView, and Trade::ImageData classes now accept the generic formats first-class. However, it's also possible to store an implementation-specific value to cover cases where a generic format enum doesn't have support for a particular format. This is done by wrapping the value using pixelFormatWrap() or compressedPixelFormatWrap(). Particular GPU APIs then assume it's their implementation-specific value and extract the value back using pixelFormatUnwrap() or compressedPixelFormatUnwrap(). There's also an isPixelFormatImplementationSpecific() and isCompressedPixelFormatImplementationSpecific() that distinguishes these values. * Many operations need pixel size and in order to have it even for implementation-specific formats, a corresponding pixelSize() overload is found via ADL on construction and the calculated size stored along the format. Previously the pixel size was only calculated on demand, but that's not possible now. In case such overload is not available, it's possible to pass pixel size manually as well. * In order to support the GL format+type pair, Image, ImageView and Trade::ImageData, there's now an additional untyped formatExtra() field that holds the second value. * The CompressedPixelStorage class is now unconditionally available on all targets, including OpenGL ES and WebGL. However, on OpenGL ES the GL APIs expect that it's all at default values. I attempted to preserve backwards compatibility as much as possible: * The PixelFormat and CompressedPixelFormat enum now contains generic API-independent values. The GL-specific formats are present there, but marked as deprecated. Use either the generic values or GL::PixelFormat (togehter with GL::PixelType) and GL::CompressedPixelFormat instead. There's a lot of ugliness caused by this, but seems to work well. * *Image::type() functions are deprecated as they were too GL-specific. Use formatExtra() and cast it to GL::PixelType instead. * Image constructors take templated format or format+extra arguments, so passing GL-specific values to them should still work.
8 years ago
CompressedPixelFormat compressedPixelFormat(const Magnum::CompressedPixelFormat format) {
if(isCompressedPixelFormatImplementationSpecific(format))
return compressedPixelFormatUnwrap<GL::CompressedPixelFormat>(format);
Reserve zero [Compressed]PixelFormat for an invalid value. Catches accidents better -- just look at the diff. Might catch accidents in your code now as well, so beware!
7 years ago
CORRADE_ASSERT(UnsignedInt(format) - 1 < Containers::arraySize(CompressedFormatMapping),
Split the OpenGL layer out, pt 9: generic pixel formats. This is quite big, so: * There are new Magnum::PixelFormat and Magnum::CompressedPixelFormat enums, which contain generic API-independent formats. In particular, PixelFormat replaces GL::PixelFormat and GL::PixelType with a single value. * There's GL::pixelFormat(), GL::pixelType(), GL::compressedPixelFormat() to convert the generic enums to GL-specific. The mapping is only in one direction, done with a lookup table (generic enums are indices to that table). * GL classes taking the formats directly (such as GL::BufferImage) have overloads that take both the GL-specific and generic format. * The generic Image, CompressedImage, ImageView, CompressedImageView, and Trade::ImageData classes now accept the generic formats first-class. However, it's also possible to store an implementation-specific value to cover cases where a generic format enum doesn't have support for a particular format. This is done by wrapping the value using pixelFormatWrap() or compressedPixelFormatWrap(). Particular GPU APIs then assume it's their implementation-specific value and extract the value back using pixelFormatUnwrap() or compressedPixelFormatUnwrap(). There's also an isPixelFormatImplementationSpecific() and isCompressedPixelFormatImplementationSpecific() that distinguishes these values. * Many operations need pixel size and in order to have it even for implementation-specific formats, a corresponding pixelSize() overload is found via ADL on construction and the calculated size stored along the format. Previously the pixel size was only calculated on demand, but that's not possible now. In case such overload is not available, it's possible to pass pixel size manually as well. * In order to support the GL format+type pair, Image, ImageView and Trade::ImageData, there's now an additional untyped formatExtra() field that holds the second value. * The CompressedPixelStorage class is now unconditionally available on all targets, including OpenGL ES and WebGL. However, on OpenGL ES the GL APIs expect that it's all at default values. I attempted to preserve backwards compatibility as much as possible: * The PixelFormat and CompressedPixelFormat enum now contains generic API-independent values. The GL-specific formats are present there, but marked as deprecated. Use either the generic values or GL::PixelFormat (togehter with GL::PixelType) and GL::CompressedPixelFormat instead. There's a lot of ugliness caused by this, but seems to work well. * *Image::type() functions are deprecated as they were too GL-specific. Use formatExtra() and cast it to GL::PixelType instead. * Image constructors take templated format or format+extra arguments, so passing GL-specific values to them should still work.
8 years ago
"GL::compressedPixelFormat(): invalid format" << format, {});
Reserve zero [Compressed]PixelFormat for an invalid value. Catches accidents better -- just look at the diff. Might catch accidents in your code now as well, so beware!
7 years ago
const CompressedPixelFormat out = CompressedFormatMapping[UnsignedInt(format) - 1];
Split the OpenGL layer out, pt 9: generic pixel formats. This is quite big, so: * There are new Magnum::PixelFormat and Magnum::CompressedPixelFormat enums, which contain generic API-independent formats. In particular, PixelFormat replaces GL::PixelFormat and GL::PixelType with a single value. * There's GL::pixelFormat(), GL::pixelType(), GL::compressedPixelFormat() to convert the generic enums to GL-specific. The mapping is only in one direction, done with a lookup table (generic enums are indices to that table). * GL classes taking the formats directly (such as GL::BufferImage) have overloads that take both the GL-specific and generic format. * The generic Image, CompressedImage, ImageView, CompressedImageView, and Trade::ImageData classes now accept the generic formats first-class. However, it's also possible to store an implementation-specific value to cover cases where a generic format enum doesn't have support for a particular format. This is done by wrapping the value using pixelFormatWrap() or compressedPixelFormatWrap(). Particular GPU APIs then assume it's their implementation-specific value and extract the value back using pixelFormatUnwrap() or compressedPixelFormatUnwrap(). There's also an isPixelFormatImplementationSpecific() and isCompressedPixelFormatImplementationSpecific() that distinguishes these values. * Many operations need pixel size and in order to have it even for implementation-specific formats, a corresponding pixelSize() overload is found via ADL on construction and the calculated size stored along the format. Previously the pixel size was only calculated on demand, but that's not possible now. In case such overload is not available, it's possible to pass pixel size manually as well. * In order to support the GL format+type pair, Image, ImageView and Trade::ImageData, there's now an additional untyped formatExtra() field that holds the second value. * The CompressedPixelStorage class is now unconditionally available on all targets, including OpenGL ES and WebGL. However, on OpenGL ES the GL APIs expect that it's all at default values. I attempted to preserve backwards compatibility as much as possible: * The PixelFormat and CompressedPixelFormat enum now contains generic API-independent values. The GL-specific formats are present there, but marked as deprecated. Use either the generic values or GL::PixelFormat (togehter with GL::PixelType) and GL::CompressedPixelFormat instead. There's a lot of ugliness caused by this, but seems to work well. * *Image::type() functions are deprecated as they were too GL-specific. Use formatExtra() and cast it to GL::PixelType instead. * Image constructors take templated format or format+extra arguments, so passing GL-specific values to them should still work.
8 years ago
CORRADE_ASSERT(UnsignedInt(out),
"GL::compressedPixelFormat(): format" << format << "is not supported on this target", {});
return out;
}
GL: added hasTextureFormat() and textureFormat() helpers.
7 years ago
TextureFormat textureFormat(const Magnum::CompressedPixelFormat format) {
if(isCompressedPixelFormatImplementationSpecific(format))
return compressedPixelFormatUnwrap<GL::TextureFormat>(format);
CORRADE_ASSERT(UnsignedInt(format) - 1 < Containers::arraySize(CompressedFormatMapping),
"GL::textureFormat(): invalid format" << format, {});
/* Enum values are the same between CompressedPixelFormat and
TextureFormat, so having just a single table for both and casting */
const auto out = TextureFormat(GLenum(CompressedFormatMapping[UnsignedInt(format) - 1]));
CORRADE_ASSERT(UnsignedInt(out),
"GL::textureFormat(): format" << format << "is not supported on this target", {});
return out;
}
Use new-style debug operators everywhere.
11 years ago
Debug& operator<<(Debug& debug, const CompressedPixelFormat value) {
Reduce string duplication in enum debug output operators. Bloaty says it saved 10 kB in Debug build of MagnumGL: VM SIZE FILE SIZE -------------- -------------- [ = ] 0 .debug_info +1.59Ki +0.0% +0.4% +1.50Ki .text +1.50Ki +0.4% [ = ] 0 .debug_str +409 +0.0% [ = ] 0 .debug_line +276 +0.1% [ = ] 0 .debug_abbrev +20 +0.0% -28.6% -2 [LOAD [RX]] -2 -28.6% [ = ] 0 [Unmapped] -4.28Ki -41.0% -22.7% -9.23Ki .rodata -9.23Ki -22.7% -0.8% -7.73Ki TOTAL -9.73Ki -0.1% And 4 kB in Release: VM SIZE FILE SIZE -------------- -------------- +1.1% +3.44Ki .text +3.44Ki +1.1% +1.7% +1.39Ki .eh_frame +1.39Ki +1.7% [ = ] 0 [Unmapped] +656 +51% -25.5% -9.47Ki .rodata -9.47Ki -25.5% -0.7% -4.64Ki TOTAL -4.00Ki -0.4% That's not negative, so I guess that's good. This change is of course more significant in the context of a minimal WebGL build, where the exe can be as little as 50 kB -- there 4 kB is almost 10% of the size.
7 years ago
debug << "GL::CompressedPixelFormat" << Debug::nospace;
Prefer CORRADE_TARGET_* instead of __GNUC__, __clang__ and _MSVC_VER. While branching on a compiler is rather common, checking a particular compiler version should be needed only rarely. Thus minimize use of such macros to make them easier to grep for.
4 years ago
#ifdef CORRADE_TARGET_GCC
Be strict for missing values in pixel format switches.
7 years ago
#pragma GCC diagnostic push
#pragma GCC diagnostic error "-Wswitch"
#endif
Compressed image support, part 3: added CompressedColorFormat enum.
11 years ago
switch(value) {
Exclude debug operators from code coverage.
10 years ago
/* LCOV_EXCL_START */
Reduce string duplication in enum debug output operators. Bloaty says it saved 10 kB in Debug build of MagnumGL: VM SIZE FILE SIZE -------------- -------------- [ = ] 0 .debug_info +1.59Ki +0.0% +0.4% +1.50Ki .text +1.50Ki +0.4% [ = ] 0 .debug_str +409 +0.0% [ = ] 0 .debug_line +276 +0.1% [ = ] 0 .debug_abbrev +20 +0.0% -28.6% -2 [LOAD [RX]] -2 -28.6% [ = ] 0 [Unmapped] -4.28Ki -41.0% -22.7% -9.23Ki .rodata -9.23Ki -22.7% -0.8% -7.73Ki TOTAL -9.73Ki -0.1% And 4 kB in Release: VM SIZE FILE SIZE -------------- -------------- +1.1% +3.44Ki .text +3.44Ki +1.1% +1.7% +1.39Ki .eh_frame +1.39Ki +1.7% [ = ] 0 [Unmapped] +656 +51% -25.5% -9.47Ki .rodata -9.47Ki -25.5% -0.7% -4.64Ki TOTAL -4.00Ki -0.4% That's not negative, so I guess that's good. This change is of course more significant in the context of a minimal WebGL build, where the exe can be as little as 50 kB -- there 4 kB is almost 10% of the size.
7 years ago
#define _c(value) case CompressedPixelFormat::value: return debug << "::" #value;
Compressed image support, part 3: added CompressedColorFormat enum.
11 years ago
#ifndef MAGNUM_TARGET_GLES
_c(Red)
_c(RG)
_c(RGB)
_c(RGBA)
Added BC4, BC5, BC6H and BC7 compression formats. Those are now also available under WebGL 1/2 and OpenGL ES 3.O (strangely not OpenGL ES 2.0) under EXT_texture_compression_{rgtc,bptc}. The GL names are extra weird-ass now that all other APIs use the BC names.
7 years ago
#endif
#if !defined(MAGNUM_TARGET_GLES2) || defined(MAGNUM_TARGET_WEBGL)
Compressed image support, part 3: added CompressedColorFormat enum.
11 years ago
_c(RedRgtc1)
_c(RGRgtc2)
_c(SignedRedRgtc1)
_c(SignedRGRgtc2)
_c(RGBBptcUnsignedFloat)
_c(RGBBptcSignedFloat)
_c(RGBABptcUnorm)
_c(SRGBAlphaBptcUnorm)
#endif
Compressed image support, part 10: support ETC2/EAC formats.
11 years ago
_c(RGB8Etc2)
_c(SRGB8Etc2)
_c(RGB8PunchthroughAlpha1Etc2)
_c(SRGB8PunchthroughAlpha1Etc2)
_c(RGBA8Etc2Eac)
_c(SRGB8Alpha8Etc2Eac)
_c(R11Eac)
_c(SignedR11Eac)
_c(RG11Eac)
_c(SignedRG11Eac)
Compressed image support, part 5: added EXT_texture_compression_s3tc. And related WebGL extension. Why the hell do they need their own naming again?!
11 years ago
_c(RGBS3tcDxt1)
Added sRGB variants of BC1/BC2/BC3 compression formats.
7 years ago
_c(SRGBS3tcDxt1)
Compressed image support, part 5: added EXT_texture_compression_s3tc. And related WebGL extension. Why the hell do they need their own naming again?!
11 years ago
_c(RGBAS3tcDxt1)
Added sRGB variants of BC1/BC2/BC3 compression formats.
7 years ago
_c(SRGBAlphaS3tcDxt1)
Compressed image support, part 5: added EXT_texture_compression_s3tc. And related WebGL extension. Why the hell do they need their own naming again?!
11 years ago
_c(RGBAS3tcDxt3)
Added sRGB variants of BC1/BC2/BC3 compression formats.
7 years ago
_c(SRGBAlphaS3tcDxt3)
Compressed image support, part 5: added EXT_texture_compression_s3tc. And related WebGL extension. Why the hell do they need their own naming again?!
11 years ago
_c(RGBAS3tcDxt5)
Added sRGB variants of BC1/BC2/BC3 compression formats.
7 years ago
_c(SRGBAlphaS3tcDxt5)
Compressed image support, part 11: support ASTC formats.
11 years ago
_c(RGBAAstc4x4)
_c(SRGB8Alpha8Astc4x4)
_c(RGBAAstc5x4)
_c(SRGB8Alpha8Astc5x4)
_c(RGBAAstc5x5)
_c(SRGB8Alpha8Astc5x5)
_c(RGBAAstc6x5)
_c(SRGB8Alpha8Astc6x5)
_c(RGBAAstc6x6)
_c(SRGB8Alpha8Astc6x6)
_c(RGBAAstc8x5)
_c(SRGB8Alpha8Astc8x5)
_c(RGBAAstc8x6)
_c(SRGB8Alpha8Astc8x6)
_c(RGBAAstc8x8)
_c(SRGB8Alpha8Astc8x8)
_c(RGBAAstc10x5)
_c(SRGB8Alpha8Astc10x5)
_c(RGBAAstc10x6)
_c(SRGB8Alpha8Astc10x6)
_c(RGBAAstc10x8)
_c(SRGB8Alpha8Astc10x8)
_c(RGBAAstc10x10)
_c(SRGB8Alpha8Astc10x10)
_c(RGBAAstc12x10)
_c(SRGB8Alpha8Astc12x10)
_c(RGBAAstc12x12)
_c(SRGB8Alpha8Astc12x12)
ASTC: the pain never ends (3D formats). GL has an extension, but only for ES, not on desktop. Vulkan has nothing yet (due to there being just ARM that implements it, no other vendor), except those being listed in a KTX format specification.
7 years ago
#if defined(MAGNUM_TARGET_GLES) && !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL)
_c(RGBAAstc3x3x3)
_c(SRGB8Alpha8Astc3x3x3)
_c(RGBAAstc4x3x3)
_c(SRGB8Alpha8Astc4x3x3)
_c(RGBAAstc4x4x3)
_c(SRGB8Alpha8Astc4x4x3)
_c(RGBAAstc4x4x4)
_c(SRGB8Alpha8Astc4x4x4)
_c(RGBAAstc5x4x4)
_c(SRGB8Alpha8Astc5x4x4)
_c(RGBAAstc5x5x4)
_c(SRGB8Alpha8Astc5x5x4)
_c(RGBAAstc5x5x5)
_c(SRGB8Alpha8Astc5x5x5)
_c(RGBAAstc6x5x5)
_c(SRGB8Alpha8Astc6x5x5)
_c(RGBAAstc6x6x5)
_c(SRGB8Alpha8Astc6x6x5)
_c(RGBAAstc6x6x6)
_c(SRGB8Alpha8Astc6x6x6)
#endif
Support for PVRTC compressed pixel format.
7 years ago
#ifdef MAGNUM_TARGET_GLES
_c(RGBPvrtc2bppV1)
#ifndef MAGNUM_TARGET_WEBGL
_c(SRGBPvrtc2bppV1)
#endif
_c(RGBAPvrtc2bppV1)
#ifndef MAGNUM_TARGET_WEBGL
_c(SRGBAlphaPvrtc2bppV1)
#endif
_c(RGBPvrtc4bppV1)
#ifndef MAGNUM_TARGET_WEBGL
_c(SRGBPvrtc4bppV1)
#endif
_c(RGBAPvrtc4bppV1)
#ifndef MAGNUM_TARGET_WEBGL
_c(SRGBAlphaPvrtc4bppV1)
#endif
#endif
Compressed image support, part 3: added CompressedColorFormat enum.
11 years ago
#undef _c
Exclude debug operators from code coverage.
10 years ago
/* LCOV_EXCL_STOP */
Compressed image support, part 3: added CompressedColorFormat enum.
11 years ago
}
Prefer CORRADE_TARGET_* instead of __GNUC__, __clang__ and _MSVC_VER. While branching on a compiler is rather common, checking a particular compiler version should be needed only rarely. Thus minimize use of such macros to make them easier to grep for.
4 years ago
#ifdef CORRADE_TARGET_GCC
Be strict for missing values in pixel format switches.
7 years ago
#pragma GCC diagnostic pop
#endif
Compressed image support, part 3: added CompressedColorFormat enum.
11 years ago
Reduce string duplication in enum debug output operators. Bloaty says it saved 10 kB in Debug build of MagnumGL: VM SIZE FILE SIZE -------------- -------------- [ = ] 0 .debug_info +1.59Ki +0.0% +0.4% +1.50Ki .text +1.50Ki +0.4% [ = ] 0 .debug_str +409 +0.0% [ = ] 0 .debug_line +276 +0.1% [ = ] 0 .debug_abbrev +20 +0.0% -28.6% -2 [LOAD [RX]] -2 -28.6% [ = ] 0 [Unmapped] -4.28Ki -41.0% -22.7% -9.23Ki .rodata -9.23Ki -22.7% -0.8% -7.73Ki TOTAL -9.73Ki -0.1% And 4 kB in Release: VM SIZE FILE SIZE -------------- -------------- +1.1% +3.44Ki .text +3.44Ki +1.1% +1.7% +1.39Ki .eh_frame +1.39Ki +1.7% [ = ] 0 [Unmapped] +656 +51% -25.5% -9.47Ki .rodata -9.47Ki -25.5% -0.7% -4.64Ki TOTAL -4.00Ki -0.4% That's not negative, so I guess that's good. This change is of course more significant in the context of a minimal WebGL build, where the exe can be as little as 50 kB -- there 4 kB is almost 10% of the size.
7 years ago
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(GLenum(value)) << Debug::nospace << ")";
Compressed image support, part 3: added CompressedColorFormat enum.
11 years ago
}
Moved texture and image formats out of the classes. Advantages: * The enums were large (600-800 lines) and they polluted the header, now they are in separate files (except for BufferTexture, which has the enum small enough to be left in the same file). * Image classes now don't need to include OpenGL headers, as they were needed only for the enum values. With advantage of C++11's forward enum declarations there is no need to include the enum headers anywhere in implementation, only when particular values are needed. * The values are now less verbose: AbstractTexture::InternalFormat::RGB8 // before TextureFormat::RGB8 // now * Resolved another "trivial choice" problem (thanks @JanDupal for introducing this term to me): how to specify the format if there are ten ways to do it (some being massively confusing): Image2D::Format f = AbstractImage::Format::RGB; // too long... Image2D::Format f = Image3D::Format::RGBA; // why 3D? this works? Image2D::Format f = BufferImage1D::Format::RGBA; // wat? It is even worse (and more verbose) with textures: Texture2D::InternalFormat f = CubeMapTextureArray::InternalFormat::RGB8; // this is allowed? To have consistent naming this change was done also with BufferTexture::InternalFormat (now BufferTextureFormat), although there were no trivial choice issues and the enum isn't too large. But at least it is now less typing.
13 years ago
#endif
Split the OpenGL layer out, pt 4: new Magnum::GL namespace. At the moment just the GL library itself w/o the tests, and without backwards compatibility aliases. The following types were left in the root namespace, despite being in the GL/ directory, as they will get moved back soon: * Image, CompressedImage and their dimensional typedefs * ImageView, CompressedImageView and their dimensional typedefs * PixelStorage Not PixelFormat etc., that one will stay in the GL namespace and a completely new PixelFormat enum will be provided in the root namespace.
8 years ago
}}