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.
7682 Commits
21 Branches
19 Tags
70 MiB
Tree: 31d3cdcdb6
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '31d3cdcdb6'
${ noResults }
magnum/src/Magnum/GL/Attribute.h

929 lines
36 KiB
Raw Normal View History Unescape

Split the OpenGL layer out, pt 1: moving files to a new location. Minimal updates (just the include guards) so Git is hopefully able to detect the rename and track the history properly. Everything except Magnum::GL doesn't compile now.
8 years ago
#ifndef Magnum_GL_Attribute_h
#define Magnum_GL_Attribute_h
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
/*
This file is part of Magnum.
Updated copyright year.
7 years ago
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
Vladimír Vondruš <mosra@centrum.cz>
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.
*/
/** @file
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
* @brief Class @ref Magnum::GL::Attribute
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
*/
#include <Corrade/Containers/EnumSet.h>
#include "Magnum/Magnum.h"
Split the OpenGL layer out, pt 1: moving files to a new location. Minimal updates (just the include guards) so Git is hopefully able to detect the rename and track the history properly. Everything except Magnum::GL doesn't compile now.
8 years ago
#include "Magnum/GL/OpenGL.h"
#include "Magnum/GL/visibility.h"
GL: improve Attribute docs with clear integer/double unavailablility errors.
7 years ago
#include "Magnum/Math/TypeTraits.h"
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
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
#ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h>
#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
namespace Magnum { namespace GL {
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
namespace Implementation { template<class> struct Attribute; }
/**
GL: doc++
7 years ago
@brief Base class for vertex attribute location and type
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
GL: improve Attribute docs with clear integer/double unavailablility errors.
7 years ago
For use in @ref AbstractShaderProgram subclasses. The @p location template
parameter is vertex attribute location, a number between @cpp 0 @ce and
Doc++ Fixed Doxygen warnings, improved some workarounds. Everything now uses explicit references (except where it doesn't work).
12 years ago
@ref AbstractShaderProgram::maxVertexAttributes(). To ensure compatibility, you
GL: improve Attribute docs with clear integer/double unavailablility errors.
7 years ago
should always have a vertex attribute with location @cpp 0 @ce.
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
GL: improve Attribute docs with clear integer/double unavailablility errors.
7 years ago
The @p T template parameter is the type which is used for shader attribute,
e.g. @ref Magnum::Vector4i "Vector4i" for @glsl ivec4 @ce. @ref DataType is
type of passed data when adding vertex buffers to mesh. By default it is the
same as type used in shader (e.g. @ref DataType::Int for
@ref Magnum::Vector4i "Vector4i"). It's also possible to pass integer data to
floating-point shader inputs. In this case you may want to normalize the values
(e.g. color components from @cpp 0 @ce -- @cpp 255 @ce to @cpp 0.0f @ce --
@cpp 1.0f @ce) --- see @ref DataOption::Normalized.
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
GL: improve Attribute docs with clear integer/double unavailablility errors.
7 years ago
@attention Only some types are allowed as attribute types and there are
additional restrictions applied for OpenGL ES and WebGL, see
@ref GL-AbstractShaderProgram-types for more information.
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 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
See @ref GL-AbstractShaderProgram-subclassing for example usage in shaders and
GL: improve Attribute docs with clear integer/double unavailablility errors.
7 years ago
@ref GL-Mesh-configuration for example usage when adding vertex buffers to a
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
mesh.
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
*/
template<UnsignedInt location, class T> class Attribute {
GL: improve Attribute docs with clear integer/double unavailablility errors.
7 years ago
#ifdef MAGNUM_TARGET_GLES2
static_assert(!Math::IsIntegral<T>::value, "integral attributes are not available on OpenGL ES 2.0 and WebGL 1");
#endif
#ifdef MAGNUM_TARGET_GLES
static_assert(!std::is_same<Math::UnderlyingTypeOf<T>, Double>::value, "double attributes and uniforms are not available in OpenGL ES and WebGL");
#endif
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
public:
enum: UnsignedInt {
Doc++
11 years ago
/**
* Location to which the attribute is bound
*
* @see @ref AbstractShaderProgram::maxVertexAttributes()
*/
Location = location,
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
/**
* Count of vectors in this type
*
* @see @ref vectorSize()
*/
VectorCount = Implementation::Attribute<T>::VectorCount
};
/**
* @brief Type
*
* Type used in shader code.
* @see @ref ScalarType, @ref DataType
*/
typedef T Type;
/**
* @brief Scalar type
*
* The underlying scalar type of the attribute.
* @see @ref Type, @ref DataType
*/
typedef typename Implementation::Attribute<T>::ScalarType ScalarType;
/**
* @brief Component count
*
* Count of components passed to the shader. If passing smaller count
* of components than corresponding type has, unspecified components
Documentation updates for the new theme in the root namespace. Also adding search keywords for hopefully all OpenGL APIs.
8 years ago
* are set to default values (second and third to @cpp 0 @ce, fourth to
* @cpp 1 @ce).
Ability to specify shader attribute properties fully at runtime. There's a new DynamicAttribute class that is very similar to Attribute, but it has the location and base type as runtime properties instead of them being a part of template. This allows for more flexibility, but OTOH also more typing and more responsibility on the user. See MeshGLTest for details and usage comparison to the Attribute API.
9 years ago
* @see @ref Attribute()
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
*/
#ifdef DOXYGEN_GENERATING_OUTPUT
enum class Components: GLint {
/**
* Only first component is specified. Second, third and fourth
Documentation updates for the new theme in the root namespace. Also adding search keywords for hopefully all OpenGL APIs.
8 years ago
* component are set to @cpp 0 @ce, @cpp 0 @ce, @cpp 1 @ce,
* respectively. Only for scalar and vector types, not matrices.
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
*/
One = 1,
/**
* First two components are specified. Third and fourth component
Documentation updates for the new theme in the root namespace. Also adding search keywords for hopefully all OpenGL APIs.
8 years ago
* are set to @cpp 0 @ce, @cpp 1 @ce, respectively. Only for two,
* three and four-component vector types and 2x2, 3x2 and 4x2
* matrix types.
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
*/
Two = 2,
/**
* First three components are specified. Fourth component is set to
Documentation updates for the new theme in the root namespace. Also adding search keywords for hopefully all OpenGL APIs.
8 years ago
* @cpp 1 @ce. Only for three and four-component vector types, 2x3,
* 3x3 and 4x3 matrix types.
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
*/
Three = 3,
/**
* All four components are specified. Only for four-component
* vector types and 2x4, 3x4 and 4x4 matrix types.
*/
Four = 4,
#ifndef MAGNUM_TARGET_GLES
/**
* Four components with BGRA ordering. Only for four-component
* float vector type. Must be used along with @ref DataType::UnsignedByte
* and @ref DataOption::Normalized.
Documentation updates for the new theme in the root namespace. Also adding search keywords for hopefully all OpenGL APIs.
8 years ago
* @m_keywords{GL_BGRA}
Doxygen: renamed \extension[2] to \gl_extension[2]. So it's clear that this is not a Vulkan extension link.
8 years ago
* @requires_gl32 Extension @gl_extension{ARB,vertex_array_bgra}
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
* @requires_gl Only RGBA component ordering is supported in OpenGL
First-class WebGL support, part 6: reduced shader functionality.
11 years ago
* ES and WebGL.
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
*/
BGRA = GL_BGRA
#endif
};
#else
typedef typename Implementation::Attribute<T>::Components Components;
#endif
/**
* @brief Data type
*
* Type of data passed to shader.
* @see @ref Type, @ref DataOptions, @ref Attribute()
Documentation updates for the new theme in the root namespace. Also adding search keywords for hopefully all OpenGL APIs.
8 years ago
* @m_enum_values_as_keywords
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
*/
#ifdef DOXYGEN_GENERATING_OUTPUT
enum class DataType: GLenum {
UnsignedByte = GL_UNSIGNED_BYTE, /**< Unsigned byte */
Byte = GL_BYTE, /**< Byte */
UnsignedShort = GL_UNSIGNED_SHORT, /**< Unsigned short */
Short = GL_SHORT, /**< Short */
UnsignedInt = GL_UNSIGNED_INT, /**< Unsigned int */
Int = GL_INT, /**< Int */
First-class WebGL support, part 6: reduced shader functionality.
11 years ago
#ifndef MAGNUM_TARGET_WEBGL
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
/**
* Half float. Only for float attribute types.
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
* @m_since_latest
Doxygen: renamed \extension[2] to \gl_extension[2]. So it's clear that this is not a Vulkan extension link.
8 years ago
* @requires_gl30 Extension @gl_extension{ARB,half_float_vertex}
* @requires_gles30 Extension @gl_extension{OES,vertex_half_float}
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
* in OpenGL ES 2.0
First-class WebGL support, part 6: reduced shader functionality.
11 years ago
* @requires_webgl20 Half float vertex attributes are not available
* in WebGL 1.0.
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
*/
Fix Attribute documentation to reflect actual enum values.
10 years ago
#ifndef MAGNUM_TARGET_GLES2
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
Half = GL_HALF_FLOAT,
Fix Attribute documentation to reflect actual enum values.
10 years ago
#else
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
Half = GL_HALF_FLOAT_OES,
#endif
#ifdef MAGNUM_BUILD_DEPRECATED
/**
* Half float.
* @m_deprecated_since_latest Use @ref DataType::Half instead.
*/
HalfFloat CORRADE_DEPRECATED_ENUM("use Half instead") = Half,
Fix Attribute documentation to reflect actual enum values.
10 years ago
#endif
First-class WebGL support, part 6: reduced shader functionality.
11 years ago
#endif
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
/** Float. Only for float attribute types. */
Float = GL_FLOAT,
#ifndef MAGNUM_TARGET_GLES
/**
* Double. Only for float and double attribute types.
First-class WebGL support, part 6: reduced shader functionality.
11 years ago
* @requires_gl Only floats are available in OpenGL ES or WebGL.
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
*/
Double = GL_DOUBLE,
/**
* Unsigned 10.11.11 packed float. Only for three-component float
* vector attribute type.
Doxygen: renamed \extension[2] to \gl_extension[2]. So it's clear that this is not a Vulkan extension link.
8 years ago
* @requires_gl44 Extension @gl_extension{ARB,vertex_type_10f_11f_11f_rev}
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
* @requires_gl Packed float attributes are not available in OpenGL
First-class WebGL support, part 6: reduced shader functionality.
11 years ago
* ES or WebGL.
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
*/
UnsignedInt10f11f11fRev = GL_UNSIGNED_INT_10F_11F_11F_REV,
#endif
/* GL_FIXED not supported */
#ifndef MAGNUM_TARGET_GLES2
/**
* Unsigned 2.10.10.10 packed integer. Only for four-component
* float vector attribute type.
Doxygen: renamed \extension[2] to \gl_extension[2]. So it's clear that this is not a Vulkan extension link.
8 years ago
* @todo How about (incompatible) @gl_extension{OES,vertex_type_10_10_10_2}?
* @requires_gl33 Extension @gl_extension{ARB,vertex_type_2_10_10_10_rev}
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
* @requires_gles30 Packed attributes are not available in OpenGL
First-class WebGL support, part 6: reduced shader functionality.
11 years ago
* ES 2.0.
* @requires_webgl20 Packed attributes are not available in WebGL
* 1.0.
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
*/
UnsignedInt2101010Rev = GL_UNSIGNED_INT_2_10_10_10_REV,
/**
* Signed 2.10.10.10 packed integer. Only for four-component float
* vector attribute type.
Doxygen: renamed \extension[2] to \gl_extension[2]. So it's clear that this is not a Vulkan extension link.
8 years ago
* @requires_gl33 Extension @gl_extension{ARB,vertex_type_2_10_10_10_rev}
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
* @requires_gles30 Packed attributes are not available in OpenGL
First-class WebGL support, part 6: reduced shader functionality.
11 years ago
* ES 2.0.
* @requires_webgl20 Packed attributes are not available in WebGL
* 1.0.
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
*/
Int2101010Rev = GL_INT_2_10_10_10_REV
#endif
};
#else
typedef typename Implementation::Attribute<T>::DataType DataType;
#endif
/**
* @brief Data option
* @see @ref DataOptions, @ref Attribute()
*/
#ifdef DOXYGEN_GENERATING_OUTPUT
enum class DataOption: UnsignedByte {
/**
* Normalize integer components. Only for float attribute types.
* Default is to not normalize.
*/
Normalized = 1 << 0
};
#else
typedef typename Implementation::Attribute<T>::DataOption DataOption;
#endif
/**
* @brief Data options
* @see @ref Attribute()
*/
#ifdef DOXYGEN_GENERATING_OUTPUT
typedef typename Containers::EnumSet<DataOption> DataOptions;
#else
typedef typename Implementation::Attribute<T>::DataOptions DataOptions;
#endif
/**
* @brief Constructor
* @param components Component count
* @param dataType Type of passed data. Default is the same as
Doxygen. Doxygen IS BROKEN BEYOND REPAIR. I introduced *strong* enum with values, in a subnamespace, that have the same name as completely unrelated typedefs. Guess what?! It breaks ALL LINKS TO THOSE TYPEDEFS! **EVERYWHERE!!!**
8 years ago
* type used in shader (e.g. @ref DataType::Int for
* @ref Magnum::Vector4i "Vector4i").
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
* @param dataOptions Data options. Default is no options.
*/
constexpr Attribute(Components components, DataType dataType = Implementation::Attribute<T>::DefaultDataType, DataOptions dataOptions = DataOptions()): _components(components), _dataType(dataType), _dataOptions(dataOptions) {}
/**
* @brief Constructor
* @param dataType Type of passed data. Default is the same as
Doxygen. Doxygen IS BROKEN BEYOND REPAIR. I introduced *strong* enum with values, in a subnamespace, that have the same name as completely unrelated typedefs. Guess what?! It breaks ALL LINKS TO THOSE TYPEDEFS! **EVERYWHERE!!!**
8 years ago
* type used in shader (e.g. @ref DataType::Int for
* @ref Magnum::Vector4i "Vector4i").
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
* @param dataOptions Data options. Default is no options.
*
* Component count is set to the same value as in type used in shader
Doxygen. Doxygen IS BROKEN BEYOND REPAIR. I introduced *strong* enum with values, in a subnamespace, that have the same name as completely unrelated typedefs. Guess what?! It breaks ALL LINKS TO THOSE TYPEDEFS! **EVERYWHERE!!!**
8 years ago
* (e.g. @ref Components::Three for @ref Magnum::Vector3 "Vector3").
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
*/
constexpr Attribute(DataType dataType = Implementation::Attribute<T>::DefaultDataType, DataOptions dataOptions = DataOptions()): _components(Implementation::Attribute<T>::DefaultComponents), _dataType(dataType), _dataOptions(dataOptions) {}
/** @brief Component count of passed data */
constexpr Components components() const { return _components; }
/** @brief Type of passed data */
constexpr DataType dataType() const { return _dataType; }
/**
* @brief Size of each vector in passed data
*
* @see @ref VectorCount
*/
UnsignedInt vectorSize() const {
return Implementation::Attribute<T>::size(GLint(_components), _dataType);
}
/** @brief Data options */
constexpr DataOptions dataOptions() const { return _dataOptions; }
private:
Components _components;
DataType _dataType;
DataOptions _dataOptions;
};
#ifdef DOXYGEN_GENERATING_OUTPUT
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
/** @debugoperatorclassenum{Attribute,Attribute::Components} */
GL: fix signature of debug operators exposed only to Doxygen.
7 years ago
template<UnsignedInt location, class T> Debug& operator<<(Debug& debug, Attribute<location, T>::Components);
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 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
/** @debugoperatorclassenum{Attribute,Attribute::DataType} */
GL: fix signature of debug operators exposed only to Doxygen.
7 years ago
template<UnsignedInt location, class T> Debug& operator<<(Debug& debug, Attribute<location, T>::DataType);
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
#endif
Ability to specify shader attribute properties fully at runtime. There's a new DynamicAttribute class that is very similar to Attribute, but it has the location and base type as runtime properties instead of them being a part of template. This allows for more flexibility, but OTOH also more typing and more responsibility on the user. See MeshGLTest for details and usage comparison to the Attribute API.
9 years ago
/**
GL: doc++
7 years ago
@brief Base class for dynamic vertex attribute location and type
Ability to specify shader attribute properties fully at runtime. There's a new DynamicAttribute class that is very similar to Attribute, but it has the location and base type as runtime properties instead of them being a part of template. This allows for more flexibility, but OTOH also more typing and more responsibility on the user. See MeshGLTest for details and usage comparison to the Attribute API.
9 years ago
Counterpart to @ref Attribute that allows runtime specification of attribute
location and base type. Note that unlike the compile-time specification, this
class doesn't do any sanity verification and leaves most of the responsibility
on the user.
*/
GL: allow to construct DynamicAttribute from VertexFormat.
6 years ago
class MAGNUM_GL_EXPORT DynamicAttribute {
Ability to specify shader attribute properties fully at runtime. There's a new DynamicAttribute class that is very similar to Attribute, but it has the location and base type as runtime properties instead of them being a part of template. This allows for more flexibility, but OTOH also more typing and more responsibility on the user. See MeshGLTest for details and usage comparison to the Attribute API.
9 years ago
public:
/**
* @brief Attribute kind
*
* Specifies what kind of shader type matches the attribute.
* @see @ref DynamicAttribute()
*/
enum class Kind {
/** Generic, matches single-precision floating-point shader type */
Generic,
/**
* Normalized integral, matches single-precision floating-point
* shader type
*/
GenericNormalized,
#ifndef MAGNUM_TARGET_GLES2
GL: improve Attribute docs with clear integer/double unavailablility errors.
7 years ago
/**
* Integral, matches integral shader type
*
* @requires_gl30 Extension @gl_extension{EXT,gpu_shader4}
* @requires_gles30 Integral attributes are not available in OpenGL
* ES 2.0.
* @requires_webgl20 Integral attributes are not available in WebGL
* 1.0.
*/
Ability to specify shader attribute properties fully at runtime. There's a new DynamicAttribute class that is very similar to Attribute, but it has the location and base type as runtime properties instead of them being a part of template. This allows for more flexibility, but OTOH also more typing and more responsibility on the user. See MeshGLTest for details and usage comparison to the Attribute API.
9 years ago
Integral,
#ifndef MAGNUM_TARGET_GLES
GL: improve Attribute docs with clear integer/double unavailablility errors.
7 years ago
/**
* Long, matches double-precision shader type
* @requires_gl40 Extension @gl_extension{ARB,gpu_shader_fp64}
* @requires_gl Double attributes and uniforms are not available in
* OpenGL ES and WebGL.
*/
Ability to specify shader attribute properties fully at runtime. There's a new DynamicAttribute class that is very similar to Attribute, but it has the location and base type as runtime properties instead of them being a part of template. This allows for more flexibility, but OTOH also more typing and more responsibility on the user. See MeshGLTest for details and usage comparison to the Attribute API.
9 years ago
Long
#endif
#endif
};
/**
* @brief Component count
*
* Count of components passed to the shader. If passing smaller count
* of components than corresponding type has, unspecified components
Documentation updates for the new theme in the root namespace. Also adding search keywords for hopefully all OpenGL APIs.
8 years ago
* are set to default values (second and third to @cpp 0 @ce, fourth to
* @cpp 1 @ce).
Ability to specify shader attribute properties fully at runtime. There's a new DynamicAttribute class that is very similar to Attribute, but it has the location and base type as runtime properties instead of them being a part of template. This allows for more flexibility, but OTOH also more typing and more responsibility on the user. See MeshGLTest for details and usage comparison to the Attribute API.
9 years ago
* @see @ref DynamicAttribute()
*/
enum class Components: GLint {
/**
* Only first component is specified. Second, third and fourth
Documentation updates for the new theme in the root namespace. Also adding search keywords for hopefully all OpenGL APIs.
8 years ago
* component are set to @cpp 0 @ce, @cpp 0 @ce, @cpp 1 @ce,
* respectively. Only for scalar and vector types, not matrices.
Ability to specify shader attribute properties fully at runtime. There's a new DynamicAttribute class that is very similar to Attribute, but it has the location and base type as runtime properties instead of them being a part of template. This allows for more flexibility, but OTOH also more typing and more responsibility on the user. See MeshGLTest for details and usage comparison to the Attribute API.
9 years ago
*/
One = 1,
/**
* First two components are specified. Third and fourth component
Documentation updates for the new theme in the root namespace. Also adding search keywords for hopefully all OpenGL APIs.
8 years ago
* are set to @cpp 0 @ce, @cpp 1 @ce, respectively. Only for two,
* three and four-component vector types and 2x2, 3x2 and 4x2
* matrix types.
Ability to specify shader attribute properties fully at runtime. There's a new DynamicAttribute class that is very similar to Attribute, but it has the location and base type as runtime properties instead of them being a part of template. This allows for more flexibility, but OTOH also more typing and more responsibility on the user. See MeshGLTest for details and usage comparison to the Attribute API.
9 years ago
*/
Two = 2,
/**
* First three components are specified. Fourth component is set to
Documentation updates for the new theme in the root namespace. Also adding search keywords for hopefully all OpenGL APIs.
8 years ago
* @cpp 1 @ce. Only for three and four-component vector types, 2x3,
* 3x3 and 4x3 matrix types.
Ability to specify shader attribute properties fully at runtime. There's a new DynamicAttribute class that is very similar to Attribute, but it has the location and base type as runtime properties instead of them being a part of template. This allows for more flexibility, but OTOH also more typing and more responsibility on the user. See MeshGLTest for details and usage comparison to the Attribute API.
9 years ago
*/
Three = 3,
/**
* All four components are specified. Only for four-component
* vector types and 2x4, 3x4 and 4x4 matrix types.
*/
Four = 4,
#ifndef MAGNUM_TARGET_GLES
/**
* Four components with BGRA ordering. Only for four-component
* float vector type. Must be used along with @ref DataType::UnsignedByte
* and @ref Kind::GenericNormalized.
Documentation updates for the new theme in the root namespace. Also adding search keywords for hopefully all OpenGL APIs.
8 years ago
* @m_keywords{GL_BGRA}
Doxygen: renamed \extension[2] to \gl_extension[2]. So it's clear that this is not a Vulkan extension link.
8 years ago
* @requires_gl32 Extension @gl_extension{ARB,vertex_array_bgra}
Ability to specify shader attribute properties fully at runtime. There's a new DynamicAttribute class that is very similar to Attribute, but it has the location and base type as runtime properties instead of them being a part of template. This allows for more flexibility, but OTOH also more typing and more responsibility on the user. See MeshGLTest for details and usage comparison to the Attribute API.
9 years ago
* @requires_gl Only RGBA component ordering is supported in OpenGL
* ES and WebGL.
*/
BGRA = GL_BGRA
#endif
};
/**
* @brief Data type
*
* Type of data passed to shader.
* @see @ref Kind, @ref DynamicAttribute()
Documentation updates for the new theme in the root namespace. Also adding search keywords for hopefully all OpenGL APIs.
8 years ago
* @m_enum_values_as_keywords
Ability to specify shader attribute properties fully at runtime. There's a new DynamicAttribute class that is very similar to Attribute, but it has the location and base type as runtime properties instead of them being a part of template. This allows for more flexibility, but OTOH also more typing and more responsibility on the user. See MeshGLTest for details and usage comparison to the Attribute API.
9 years ago
*/
enum class DataType: GLenum {
UnsignedByte = GL_UNSIGNED_BYTE, /**< Unsigned byte */
Byte = GL_BYTE, /**< Byte */
UnsignedShort = GL_UNSIGNED_SHORT, /**< Unsigned short */
Short = GL_SHORT, /**< Short */
UnsignedInt = GL_UNSIGNED_INT, /**< Unsigned int */
Int = GL_INT, /**< Int */
Half float attributes are available on WebGL 2.
8 years ago
#if !(defined(MAGNUM_TARGET_WEBGL) && defined(MAGNUM_TARGET_GLES2))
Ability to specify shader attribute properties fully at runtime. There's a new DynamicAttribute class that is very similar to Attribute, but it has the location and base type as runtime properties instead of them being a part of template. This allows for more flexibility, but OTOH also more typing and more responsibility on the user. See MeshGLTest for details and usage comparison to the Attribute API.
9 years ago
/**
* Half float. Only for float attribute types.
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
* @m_since_latest
Doxygen: renamed \extension[2] to \gl_extension[2]. So it's clear that this is not a Vulkan extension link.
8 years ago
* @requires_gl30 Extension @gl_extension{ARB,half_float_vertex}
* @requires_gles30 Extension @gl_extension{OES,vertex_half_float}
Ability to specify shader attribute properties fully at runtime. There's a new DynamicAttribute class that is very similar to Attribute, but it has the location and base type as runtime properties instead of them being a part of template. This allows for more flexibility, but OTOH also more typing and more responsibility on the user. See MeshGLTest for details and usage comparison to the Attribute API.
9 years ago
* in OpenGL ES 2.0
* @requires_webgl20 Half float vertex attributes are not available
* in WebGL 1.0.
*/
#ifndef MAGNUM_TARGET_GLES2
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
Half = GL_HALF_FLOAT,
Ability to specify shader attribute properties fully at runtime. There's a new DynamicAttribute class that is very similar to Attribute, but it has the location and base type as runtime properties instead of them being a part of template. This allows for more flexibility, but OTOH also more typing and more responsibility on the user. See MeshGLTest for details and usage comparison to the Attribute API.
9 years ago
#else
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
Half = GL_HALF_FLOAT_OES,
#endif
#ifdef MAGNUM_BUILD_DEPRECATED
/**
* Half float.
doc: another day, another heap of Doxygen fun.
6 years ago
* @m_deprecated_since_latest Use @ref DataType::Half instead.
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
*/
HalfFloat CORRADE_DEPRECATED_ENUM("use Half instead") = Half,
Ability to specify shader attribute properties fully at runtime. There's a new DynamicAttribute class that is very similar to Attribute, but it has the location and base type as runtime properties instead of them being a part of template. This allows for more flexibility, but OTOH also more typing and more responsibility on the user. See MeshGLTest for details and usage comparison to the Attribute API.
9 years ago
#endif
#endif
/** Float. Only for float attribute types. */
Float = GL_FLOAT,
#ifndef MAGNUM_TARGET_GLES
/**
* Double. Only for float and double attribute types.
* @requires_gl Only floats are available in OpenGL ES or WebGL.
*/
Double = GL_DOUBLE,
/**
* Unsigned 10.11.11 packed float. Only for three-component float
* vector attribute type.
Doxygen: renamed \extension[2] to \gl_extension[2]. So it's clear that this is not a Vulkan extension link.
8 years ago
* @requires_gl44 Extension @gl_extension{ARB,vertex_type_10f_11f_11f_rev}
Ability to specify shader attribute properties fully at runtime. There's a new DynamicAttribute class that is very similar to Attribute, but it has the location and base type as runtime properties instead of them being a part of template. This allows for more flexibility, but OTOH also more typing and more responsibility on the user. See MeshGLTest for details and usage comparison to the Attribute API.
9 years ago
* @requires_gl Packed float attributes are not available in OpenGL
* ES or WebGL.
*/
UnsignedInt10f11f11fRev = GL_UNSIGNED_INT_10F_11F_11F_REV,
#endif
/* GL_FIXED not supported */
#ifndef MAGNUM_TARGET_GLES2
/**
* Unsigned 2.10.10.10 packed integer. Only for four-component
* float vector attribute type.
Doxygen: renamed \extension[2] to \gl_extension[2]. So it's clear that this is not a Vulkan extension link.
8 years ago
* @todo How about (incompatible) @gl_extension{OES,vertex_type_10_10_10_2}?
* @requires_gl33 Extension @gl_extension{ARB,vertex_type_2_10_10_10_rev}
Ability to specify shader attribute properties fully at runtime. There's a new DynamicAttribute class that is very similar to Attribute, but it has the location and base type as runtime properties instead of them being a part of template. This allows for more flexibility, but OTOH also more typing and more responsibility on the user. See MeshGLTest for details and usage comparison to the Attribute API.
9 years ago
* @requires_gles30 Packed attributes are not available in OpenGL
* ES 2.0.
* @requires_webgl20 Packed attributes are not available in WebGL
* 1.0.
*/
UnsignedInt2101010Rev = GL_UNSIGNED_INT_2_10_10_10_REV,
/**
* Signed 2.10.10.10 packed integer. Only for four-component float
* vector attribute type.
Doxygen: renamed \extension[2] to \gl_extension[2]. So it's clear that this is not a Vulkan extension link.
8 years ago
* @requires_gl33 Extension @gl_extension{ARB,vertex_type_2_10_10_10_rev}
Ability to specify shader attribute properties fully at runtime. There's a new DynamicAttribute class that is very similar to Attribute, but it has the location and base type as runtime properties instead of them being a part of template. This allows for more flexibility, but OTOH also more typing and more responsibility on the user. See MeshGLTest for details and usage comparison to the Attribute API.
9 years ago
* @requires_gles30 Packed attributes are not available in OpenGL
* ES 2.0.
* @requires_webgl20 Packed attributes are not available in WebGL
* 1.0.
*/
Int2101010Rev = GL_INT_2_10_10_10_REV
#endif
};
/**
* @brief Constructor
* @param kind Attribute kind
* @param location Attribute location
* @param components Component count
* @param dataType Type of passed data
*/
GL: mark the 4-argument DynamicAttribute constructor as explicit. Should have been done since ever, considering it was not annotated with /*implicit*/.
6 years ago
constexpr explicit DynamicAttribute(Kind kind, UnsignedInt location, Components components, DataType dataType): _kind{kind}, _location{location}, _components{components}, _dataType{dataType} {}
Ability to specify shader attribute properties fully at runtime. There's a new DynamicAttribute class that is very similar to Attribute, but it has the location and base type as runtime properties instead of them being a part of template. This allows for more flexibility, but OTOH also more typing and more responsibility on the user. See MeshGLTest for details and usage comparison to the Attribute API.
9 years ago
doc: label deprecated APIs and stuff new since 2019.10 with version info. Should make new things more discoverable, avoid confusion when a documented API isn't there and reduce the need for maintaining multiple separate versions of the docs.
7 years ago
/**
* @brief Construct from a compile-time attribute
* @m_since{2019,10}
*/
GL: mark the 4-argument DynamicAttribute constructor as explicit. Should have been done since ever, considering it was not annotated with /*implicit*/.
6 years ago
template<UnsignedInt location_, class T> constexpr /*implicit*/ DynamicAttribute(const Attribute<location_, T>& attribute);
GL: make DynamicAttribute constructible directly from an Attribute. Otherwise trying to mirror all the properties is quite error-prone.
7 years ago
GL: allow to construct DynamicAttribute from VertexFormat.
6 years ago
/**
* @brief Construct from a generic mesh attribute type
* @m_since_latest
*
* The @p type is expected to be compatible with @p kind --- i.e.,
* normalized or floating-point for @ref Kind::GenericNormalized,
* non-normalized for @ref Kind::Integral / @ref Kind::Long and
* integral for @ref Kind::Integral.
*/
explicit DynamicAttribute(Kind kind, UnsignedInt location, VertexFormat format): DynamicAttribute{kind, location, format, 4} {}
/**
* @brief Construct from a compile-time attribute with a generic mesh attribute type override
* @m_since_latest
*
* Extracts kind and location from passed @ref Attribute type and calls
* @ref DynamicAttribute(Kind, UnsignedInt, VertexFormat). Expects that
* @p type's component count is not larger than the component count
* defined in the @p Attribute type. Note that only the
* compile-time-defined properties of the @p Attribute type are used,
* the instance-specific data type, options and component count is
* ignored.
*/
template<UnsignedInt location_, class T> explicit DynamicAttribute(const Attribute<location_, T>&, VertexFormat format);
Ability to specify shader attribute properties fully at runtime. There's a new DynamicAttribute class that is very similar to Attribute, but it has the location and base type as runtime properties instead of them being a part of template. This allows for more flexibility, but OTOH also more typing and more responsibility on the user. See MeshGLTest for details and usage comparison to the Attribute API.
9 years ago
/** @brief Attribute kind */
constexpr Kind kind() const { return _kind; }
/** @brief Attribute location */
constexpr UnsignedInt location() const { return _location; }
GL: doc++
7 years ago
/** @brief Component count */
Ability to specify shader attribute properties fully at runtime. There's a new DynamicAttribute class that is very similar to Attribute, but it has the location and base type as runtime properties instead of them being a part of template. This allows for more flexibility, but OTOH also more typing and more responsibility on the user. See MeshGLTest for details and usage comparison to the Attribute API.
9 years ago
constexpr Components components() const { return _components; }
/** @brief Type of passed data */
constexpr DataType dataType() const { return _dataType; }
private:
GL: allow to construct DynamicAttribute from VertexFormat.
6 years ago
/* Used by the constructor taking Attribute, defined in cpp to avoid
a dependency on <Magnum/Mesh.h> for the assertion */
explicit DynamicAttribute(Kind kind, UnsignedInt location, VertexFormat format, GLint maxComponents);
Ability to specify shader attribute properties fully at runtime. There's a new DynamicAttribute class that is very similar to Attribute, but it has the location and base type as runtime properties instead of them being a part of template. This allows for more flexibility, but OTOH also more typing and more responsibility on the user. See MeshGLTest for details and usage comparison to the Attribute API.
9 years ago
Kind _kind;
UnsignedInt _location;
Components _components;
DataType _dataType;
};
GL: debug output for DynamicAttribute enums. Forgotten, apparently.
7 years ago
/** @debugoperatorclassenum{DynamicAttribute,DynamicAttribute::Kind} */
MAGNUM_GL_EXPORT Debug& operator<<(Debug& debug, DynamicAttribute::Kind);
/** @debugoperatorclassenum{DynamicAttribute,DynamicAttribute::Components} */
MAGNUM_GL_EXPORT Debug& operator<<(Debug& debug, DynamicAttribute::Components);
/** @debugoperatorclassenum{DynamicAttribute,DynamicAttribute::DataType} */
MAGNUM_GL_EXPORT Debug& operator<<(Debug& debug, DynamicAttribute::DataType);
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
namespace Implementation {
GL: make DynamicAttribute constructible directly from an Attribute. Otherwise trying to mirror all the properties is quite error-prone.
7 years ago
template<UnsignedInt location, class T> constexpr DynamicAttribute::Kind kindFor(typename std::enable_if<std::is_same<typename Implementation::Attribute<T>::ScalarType, Float>::value, typename GL::Attribute<location, T>::DataOptions>::type options) {
return options & GL::Attribute<location, T>::DataOption::Normalized ?
DynamicAttribute::Kind::GenericNormalized : DynamicAttribute::Kind::Generic;
}
#ifndef MAGNUM_TARGET_GLES2
template<UnsignedInt location, class T> constexpr DynamicAttribute::Kind kindFor(typename std::enable_if<std::is_integral<typename Implementation::Attribute<T>::ScalarType>::value, typename GL::Attribute<location, T>::DataOptions>::type) {
return DynamicAttribute::Kind::Integral;
}
#ifndef MAGNUM_TARGET_GLES
template<UnsignedInt location, class T> constexpr DynamicAttribute::Kind kindFor(typename std::enable_if<std::is_same<typename Implementation::Attribute<T>::ScalarType, Double>::value, typename GL::Attribute<location, T>::DataOptions>::type) {
return DynamicAttribute::Kind::Long;
}
#endif
#endif
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
/* Base for sized attributes */
template<std::size_t cols, std::size_t rows> struct SizedAttribute;
/* Vector attribute sizes */
template<std::size_t cols> struct SizedVectorAttribute {
enum: UnsignedInt { VectorCount = UnsignedInt(cols) };
};
template<> struct SizedAttribute<1, 1>: SizedVectorAttribute<1> {
enum class Components: GLint { One = 1 };
constexpr static Components DefaultComponents = Components::One;
};
template<> struct SizedAttribute<1, 2>: SizedVectorAttribute<1> {
enum class Components: GLint { One = 1, Two = 2 };
constexpr static Components DefaultComponents = Components::Two;
};
template<> struct SizedAttribute<1, 3>: SizedVectorAttribute<1> {
enum class Components: GLint { One = 1, Two = 2, Three = 3 };
constexpr static Components DefaultComponents = Components::Three;
};
template<> struct SizedAttribute<1, 4>: SizedVectorAttribute<1> {
enum class Components: GLint { One = 1, Two = 2, Three = 3, Four = 4 };
constexpr static Components DefaultComponents = Components::Four;
};
Split the OpenGL layer out, pt 1: moving files to a new location. Minimal updates (just the include guards) so Git is hopefully able to detect the rename and track the history properly. Everything except Magnum::GL doesn't compile now.
8 years ago
MAGNUM_GL_EXPORT Debug& operator<<(Debug& debug, SizedAttribute<1, 1>::Components value);
MAGNUM_GL_EXPORT Debug& operator<<(Debug& debug, SizedAttribute<1, 2>::Components value);
MAGNUM_GL_EXPORT Debug& operator<<(Debug& debug, SizedAttribute<1, 3>::Components value);
MAGNUM_GL_EXPORT Debug& operator<<(Debug& debug, SizedAttribute<1, 4>::Components value);
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
/* Matrix attribute sizes */
template<std::size_t rows> struct SizedMatrixAttribute;
template<> struct SizedMatrixAttribute<2> {
enum class Components: GLint { Two = 2 };
constexpr static Components DefaultComponents = Components::Two;
};
template<> struct SizedMatrixAttribute<3> {
enum class Components: GLint { Three = 3 };
constexpr static Components DefaultComponents = Components::Three;
};
template<> struct SizedMatrixAttribute<4> {
enum class Components: GLint { Four = 4 };
constexpr static Components DefaultComponents = Components::Four;
};
Split the OpenGL layer out, pt 1: moving files to a new location. Minimal updates (just the include guards) so Git is hopefully able to detect the rename and track the history properly. Everything except Magnum::GL doesn't compile now.
8 years ago
MAGNUM_GL_EXPORT Debug& operator<<(Debug& debug, SizedMatrixAttribute<2>::Components value);
MAGNUM_GL_EXPORT Debug& operator<<(Debug& debug, SizedMatrixAttribute<3>::Components value);
MAGNUM_GL_EXPORT Debug& operator<<(Debug& debug, SizedMatrixAttribute<4>::Components value);
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
template<> struct SizedAttribute<2, 2>: SizedVectorAttribute<2>, SizedMatrixAttribute<2> {};
template<> struct SizedAttribute<3, 3>: SizedVectorAttribute<3>, SizedMatrixAttribute<3> {};
template<> struct SizedAttribute<4, 4>: SizedVectorAttribute<4>, SizedMatrixAttribute<4> {};
#ifndef MAGNUM_TARGET_GLES2
template<> struct SizedAttribute<2, 3>: SizedVectorAttribute<2>, SizedMatrixAttribute<3> {};
template<> struct SizedAttribute<3, 2>: SizedVectorAttribute<3>, SizedMatrixAttribute<2> {};
template<> struct SizedAttribute<2, 4>: SizedVectorAttribute<2>, SizedMatrixAttribute<4> {};
template<> struct SizedAttribute<4, 2>: SizedVectorAttribute<4>, SizedMatrixAttribute<2> {};
template<> struct SizedAttribute<3, 4>: SizedVectorAttribute<3>, SizedMatrixAttribute<4> {};
template<> struct SizedAttribute<4, 3>: SizedVectorAttribute<4>, SizedMatrixAttribute<3> {};
#endif
/* Base for attributes */
template<class> struct Attribute;
/* Base for float attributes */
struct FloatAttribute {
typedef Float ScalarType;
enum class DataType: GLenum {
UnsignedByte = GL_UNSIGNED_BYTE,
Byte = GL_BYTE,
UnsignedShort = GL_UNSIGNED_SHORT,
Short = GL_SHORT,
UnsignedInt = GL_UNSIGNED_INT,
Int = GL_INT,
GL: don't expose half float attributes on WebGL 1. They weren't in the docs but in the internals. That's wrong.
7 years ago
#if !(defined(MAGNUM_TARGET_WEBGL) && defined(MAGNUM_TARGET_GLES2))
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
#ifndef MAGNUM_TARGET_GLES2
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
Half = GL_HALF_FLOAT,
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
#else
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
Half = GL_HALF_FLOAT_OES,
#endif
#ifdef MAGNUM_BUILD_DEPRECATED
HalfFloat CORRADE_DEPRECATED_ENUM("use Half instead") = Half,
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
#endif
GL: don't expose half float attributes on WebGL 1. They weren't in the docs but in the internals. That's wrong.
7 years ago
#endif
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
Float = GL_FLOAT
#ifndef MAGNUM_TARGET_GLES
,
Double = GL_DOUBLE
#endif
};
constexpr static DataType DefaultDataType = DataType::Float;
enum class DataOption: UnsignedByte {
Normalized = 1 << 0
};
typedef Containers::EnumSet<DataOption> DataOptions;
Split the OpenGL layer out, pt 1: moving files to a new location. Minimal updates (just the include guards) so Git is hopefully able to detect the rename and track the history properly. Everything except Magnum::GL doesn't compile now.
8 years ago
static UnsignedInt MAGNUM_GL_EXPORT size(GLint components, DataType dataType);
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
};
CORRADE_ENUMSET_OPERATORS(FloatAttribute::DataOptions)
Split the OpenGL layer out, pt 1: moving files to a new location. Minimal updates (just the include guards) so Git is hopefully able to detect the rename and track the history properly. Everything except Magnum::GL doesn't compile now.
8 years ago
MAGNUM_GL_EXPORT Debug& operator<<(Debug& debug, FloatAttribute::DataType value);
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
#ifndef MAGNUM_TARGET_GLES2
/* Base for int attributes */
struct IntAttribute {
typedef Int ScalarType;
enum class DataType: GLenum {
UnsignedByte = GL_UNSIGNED_BYTE,
Byte = GL_BYTE,
UnsignedShort = GL_UNSIGNED_SHORT,
Short = GL_SHORT,
UnsignedInt = GL_UNSIGNED_INT,
Int = GL_INT
};
constexpr static DataType DefaultDataType = DataType::Int;
enum class DataOption: UnsignedByte {};
typedef Containers::EnumSet<DataOption> DataOptions;
Split the OpenGL layer out, pt 1: moving files to a new location. Minimal updates (just the include guards) so Git is hopefully able to detect the rename and track the history properly. Everything except Magnum::GL doesn't compile now.
8 years ago
static UnsignedInt MAGNUM_GL_EXPORT size(GLint components, DataType dataType);
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
};
CORRADE_ENUMSET_OPERATORS(IntAttribute::DataOptions)
Split the OpenGL layer out, pt 1: moving files to a new location. Minimal updates (just the include guards) so Git is hopefully able to detect the rename and track the history properly. Everything except Magnum::GL doesn't compile now.
8 years ago
MAGNUM_GL_EXPORT Debug& operator<<(Debug& debug, IntAttribute::DataType value);
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
/* Base for unsigned int attributes */
struct UnsignedIntAttribute {
typedef UnsignedInt ScalarType;
typedef IntAttribute::DataType DataType;
constexpr static DataType DefaultDataType = DataType::UnsignedInt;
typedef IntAttribute::DataOption DataOption;
typedef IntAttribute::DataOptions DataOptions;
static UnsignedInt size(GLint components, DataType dataType) {
return IntAttribute::size(components, dataType);
}
};
#endif
#ifndef MAGNUM_TARGET_GLES
/* Base for double attributes */
struct DoubleAttribute {
typedef Double ScalarType;
enum class DataType: GLenum {
Double = GL_DOUBLE
};
constexpr static DataType DefaultDataType = DataType::Double;
typedef IntAttribute::DataOption DataOption;
typedef IntAttribute::DataOptions DataOptions;
Split the OpenGL layer out, pt 1: moving files to a new location. Minimal updates (just the include guards) so Git is hopefully able to detect the rename and track the history properly. Everything except Magnum::GL doesn't compile now.
8 years ago
static UnsignedInt MAGNUM_GL_EXPORT size(GLint components, DataType dataType);
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
};
Split the OpenGL layer out, pt 1: moving files to a new location. Minimal updates (just the include guards) so Git is hopefully able to detect the rename and track the history properly. Everything except Magnum::GL doesn't compile now.
8 years ago
MAGNUM_GL_EXPORT Debug& operator<<(Debug& debug, DoubleAttribute::DataType value);
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
#endif
/* Floating-point three-component vector has additional data type compared to
classic floats */
template<> struct Attribute<Math::Vector<3, Float>>: SizedAttribute<1, 3> {
typedef Float ScalarType;
enum class DataType: GLenum {
UnsignedByte = GL_UNSIGNED_BYTE,
Byte = GL_BYTE,
UnsignedShort = GL_UNSIGNED_SHORT,
Short = GL_SHORT,
UnsignedInt = GL_UNSIGNED_INT,
Int = GL_INT,
GL: don't expose half float attributes on WebGL 1. They weren't in the docs but in the internals. That's wrong.
7 years ago
#if !(defined(MAGNUM_TARGET_WEBGL) && defined(MAGNUM_TARGET_GLES2))
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
#ifndef MAGNUM_TARGET_GLES2
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
Half = GL_HALF_FLOAT,
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
#else
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
Half = GL_HALF_FLOAT_OES,
#endif
#ifdef MAGNUM_BUILD_DEPRECATED
HalfFloat CORRADE_DEPRECATED_ENUM("use Half instead") = Half,
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
#endif
GL: don't expose half float attributes on WebGL 1. They weren't in the docs but in the internals. That's wrong.
7 years ago
#endif
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
Float = GL_FLOAT
#ifndef MAGNUM_TARGET_GLES
,
Double = GL_DOUBLE,
UnsignedInt10f11f11fRev = GL_UNSIGNED_INT_10F_11F_11F_REV
#endif
};
constexpr static DataType DefaultDataType = DataType::Float;
typedef FloatAttribute::DataOption DataOption;
typedef FloatAttribute::DataOptions DataOptions;
Split the OpenGL layer out, pt 1: moving files to a new location. Minimal updates (just the include guards) so Git is hopefully able to detect the rename and track the history properly. Everything except Magnum::GL doesn't compile now.
8 years ago
static UnsignedInt MAGNUM_GL_EXPORT size(GLint components, DataType dataType);
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
};
Split the OpenGL layer out, pt 1: moving files to a new location. Minimal updates (just the include guards) so Git is hopefully able to detect the rename and track the history properly. Everything except Magnum::GL doesn't compile now.
8 years ago
MAGNUM_GL_EXPORT Debug& operator<<(Debug& debug, Attribute<Math::Vector<3, Float>>::DataType value);
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
/* Floating-point four-component vector is absolutely special case */
template<> struct Attribute<Math::Vector<4, Float>> {
typedef Float ScalarType;
enum class Components: GLint {
One = 1,
Two = 2,
Three = 3,
Four = 4
#ifndef MAGNUM_TARGET_GLES
,
BGRA = GL_BGRA
#endif
};
constexpr static Components DefaultComponents = Components::Four;
enum class DataType: GLenum {
UnsignedByte = GL_UNSIGNED_BYTE,
Byte = GL_BYTE,
UnsignedShort = GL_UNSIGNED_SHORT,
Short = GL_SHORT,
UnsignedInt = GL_UNSIGNED_INT,
Int = GL_INT,
GL: don't expose half float attributes on WebGL 1. They weren't in the docs but in the internals. That's wrong.
7 years ago
#if !(defined(MAGNUM_TARGET_WEBGL) && defined(MAGNUM_TARGET_GLES2))
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
#ifndef MAGNUM_TARGET_GLES2
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
Half = GL_HALF_FLOAT,
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
#else
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
Half = GL_HALF_FLOAT_OES,
#endif
#ifdef MAGNUM_BUILD_DEPRECATED
HalfFloat CORRADE_DEPRECATED_ENUM("use Half instead") = Half,
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
#endif
GL: don't expose half float attributes on WebGL 1. They weren't in the docs but in the internals. That's wrong.
7 years ago
#endif
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
Float = GL_FLOAT
#ifndef MAGNUM_TARGET_GLES
,
Double = GL_DOUBLE
#endif
#ifndef MAGNUM_TARGET_GLES2
,
UnsignedInt2101010Rev = GL_UNSIGNED_INT_2_10_10_10_REV,
Int2101010Rev = GL_INT_2_10_10_10_REV
#endif
};
constexpr static DataType DefaultDataType = DataType::Float;
typedef FloatAttribute::DataOption DataOption;
typedef FloatAttribute::DataOptions DataOptions;
enum: UnsignedInt { VectorCount = 1 };
Split the OpenGL layer out, pt 1: moving files to a new location. Minimal updates (just the include guards) so Git is hopefully able to detect the rename and track the history properly. Everything except Magnum::GL doesn't compile now.
8 years ago
static UnsignedInt MAGNUM_GL_EXPORT size(GLint components, DataType dataType);
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
};
Split the OpenGL layer out, pt 1: moving files to a new location. Minimal updates (just the include guards) so Git is hopefully able to detect the rename and track the history properly. Everything except Magnum::GL doesn't compile now.
8 years ago
MAGNUM_GL_EXPORT Debug& operator<<(Debug& debug, Attribute<Math::Vector<4, Float>>::Components value);
MAGNUM_GL_EXPORT Debug& operator<<(Debug& debug, Attribute<Math::Vector<4, Float>>::DataType value);
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
/* Common float, int, unsigned int and double scalar attributes */
template<> struct Attribute<Float>: FloatAttribute, SizedAttribute<1, 1> {};
#ifndef MAGNUM_TARGET_GLES2
template<> struct Attribute<Int>: IntAttribute, SizedAttribute<1, 1> {};
template<> struct Attribute<UnsignedInt>: UnsignedIntAttribute, SizedAttribute<1, 1> {};
#ifndef MAGNUM_TARGET_GLES
template<> struct Attribute<Double>: DoubleAttribute, SizedAttribute<1, 1> {};
#endif
#endif
/* Common float, int, unsigned int and double vector attributes */
template<std::size_t size_> struct Attribute<Math::Vector<size_, Float>>: FloatAttribute, SizedAttribute<1, size_> {};
#ifndef MAGNUM_TARGET_GLES2
template<std::size_t size_> struct Attribute<Math::Vector<size_, Int>>: IntAttribute, SizedAttribute<1, size_> {};
template<std::size_t size_> struct Attribute<Math::Vector<size_, UnsignedInt>>: UnsignedIntAttribute, SizedAttribute<1, size_> {};
#ifndef MAGNUM_TARGET_GLES
template<std::size_t size_> struct Attribute<Math::Vector<size_, Double>>: DoubleAttribute, SizedAttribute<1, size_> {};
#endif
#endif
template<class T> struct Attribute<Math::Vector2<T>>: Attribute<Math::Vector<2, T>> {};
template<class T> struct Attribute<Math::Vector3<T>>: Attribute<Math::Vector<3, T>> {};
template<class T> struct Attribute<Math::Vector4<T>>: Attribute<Math::Vector<4, T>> {};
Moved Color to Math namespace. Apart from different include (<Magnum/Math/Color.h> instead of <Magnum/Color.h>) there shouldn't be any visible change to the user. The BasicColor3 and BasicColor4 classes are now Math::Color3 and Math::Color4. The Color3, Color4, Color3ub and Color4ub typedefs in Magnum namespace stayed the same. BasicColor3 and BasicColor4 is now an alias to Math::Color3 and Math::Color4, is marked as deprecated and will be removed in future release. The same goes for the <Magnum/Color.h> include, which now just includes the <Magnum/Math/Color.h> header.
11 years ago
template<class T> struct Attribute<Math::Color3<T>>: Attribute<Math::Vector3<T>> {};
template<class T> struct Attribute<Math::Color4<T>>: Attribute<Math::Vector4<T>> {};
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
/* Common float and double rectangular matrix attributes */
template<std::size_t cols, std::size_t rows> struct Attribute<Math::RectangularMatrix<cols, rows, Float>>: FloatAttribute, SizedAttribute<cols, rows> {};
#ifndef MAGNUM_TARGET_GLES
template<std::size_t cols, std::size_t rows> struct Attribute<Math::RectangularMatrix<cols, rows, Double>>: DoubleAttribute, SizedAttribute<cols, rows> {};
#endif
/* Common float and double square matrix attributes */
template<std::size_t size_> struct Attribute<Math::Matrix<size_, Float>>: Attribute<Math::RectangularMatrix<size_, size_, Float>> {};
#ifndef MAGNUM_TARGET_GLES
template<std::size_t size_> struct Attribute<Math::Matrix<size_, Double>>: Attribute<Math::RectangularMatrix<size_, size_, Double>> {};
#endif
template<class T> struct Attribute<Math::Matrix3<T>>: Attribute<Math::Matrix<3, T>> {};
template<class T> struct Attribute<Math::Matrix4<T>>: Attribute<Math::Matrix<4, T>> {};
}
GL: make DynamicAttribute constructible directly from an Attribute. Otherwise trying to mirror all the properties is quite error-prone.
7 years ago
template<UnsignedInt location_, class T> constexpr DynamicAttribute::DynamicAttribute(const Attribute<location_, T>& attribute): _kind{Implementation::kindFor<location_, T>(attribute.dataOptions())}, _location{location_}, _components{Components(GLint(attribute.components()))}, _dataType{DataType(GLenum(attribute.dataType()))} {}
GL: allow to construct DynamicAttribute from VertexFormat.
6 years ago
template<UnsignedInt location_, class T> DynamicAttribute::DynamicAttribute(const Attribute<location_, T>& attribute, const VertexFormat format): DynamicAttribute{Implementation::kindFor<location_, T>(attribute.dataOptions()), location_, format, GLint(Implementation::Attribute<T>::DefaultComponents)} {}
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
}}
Moved Attribute class out of AbstractShaderProgram enum. No backward compatibility issues should exist, as the class is in most (if not all) cases used with unscoped name: class MyShader: public AbstractShaderProgram { public: typedef Attribute<0, Vector3> Position; // ... };
12 years ago
#endif