diff --git a/doc/changelog.dox b/doc/changelog.dox index 7e6e319c7..bd6dd1e95 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -374,6 +374,11 @@ See also: prior to every draw, however with the new multidraw workflows that's no longer the case and the inability to chain draw calls proved to be annoying. +- Single-value @ref GL::AbstractShaderProgram::setUniform() calls now go + directly instead of through the pointer variant of @fn_gl{Uniform} APIs, + leading to less garbage generated on WebGL and circumventing certain driver + bugs (see [mosra/magnum#591](https://github.com/mosra/magnum/issues/591) + and [mosra/magnum#592](https://github.com/mosra/magnum/pull/592)) - Added an @ref GL::AbstractShaderProgram::setTransformFeedbackOutputs() overload taking a @relativeref{Corrade,Containers::ArrayView} instead of a @ref std::initializer_list diff --git a/doc/credits.dox b/doc/credits.dox index 0d46ab2b2..29bed54ce 100644 --- a/doc/credits.dox +++ b/doc/credits.dox @@ -146,8 +146,9 @@ Are the below lists missing your name or something's wrong? improvements to Debian package building experience - **Hilario Pérez Corona** ([\@hpcorona](https://github.com/hpcorona)) --- improvements to @cb{.cmake} android_create_apk() @ce -- **Hugo Amnov** ([\@hugoam](https://github.com/hugoam)) --- buildsystem - improvements and STL usage cleanup +- **Hugo Amnov** ([\@hugoam](https://github.com/hugoam)) --- Additions and + performance optimization in the @ref GL library, buildsystem improvements + and STL usage cleanup - **Ivan P.** ([\@uzername](https://github.com/uzername)) --- documentation improvements - **Ivan Sanz Carasa** ([\@isc30](https://github.com/isc30)) --- buildsystem diff --git a/src/Magnum/GL/AbstractShaderProgram.cpp b/src/Magnum/GL/AbstractShaderProgram.cpp index ec4dd014d..25acacc37 100644 --- a/src/Magnum/GL/AbstractShaderProgram.cpp +++ b/src/Magnum/GL/AbstractShaderProgram.cpp @@ -3,7 +3,8 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš - Copyright © Vladislav Oleshko + Copyright © 2022 Vladislav Oleshko + Copyright @ 2022 Hugo Amiard Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/GL/AbstractShaderProgram.h b/src/Magnum/GL/AbstractShaderProgram.h index 5e7694a1c..d72d37ec6 100644 --- a/src/Magnum/GL/AbstractShaderProgram.h +++ b/src/Magnum/GL/AbstractShaderProgram.h @@ -5,7 +5,8 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš - Copyright © Vladislav Oleshko + Copyright © 2022 Vladislav Oleshko + Copyright @ 2022 Hugo Amiard Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -1635,19 +1636,18 @@ class MAGNUM_GL_EXPORT AbstractShaderProgram: public AbstractObject { } #endif - template void setUniform(Int location, const Math::RectangularMatrix& value) { - setUniform(location, {&value, 1}); - } - /** - * @brief Set uniform value + * @brief Set a float uniform value * @param location Uniform location * @param value Value * - * Convenience alternative for setting one value, see - * @ref setUniform(Int, Containers::ArrayView) for more - * information. - * @see @ref uniformLocation() + * If neither @gl_extension{ARB,separate_shader_objects} (part of + * OpenGL 4.1) nor @gl_extension{EXT,separate_shader_objects} OpenGL ES + * extension nor OpenGL ES 3.1 is available, the shader is marked for + * use before the operation. + * @see @ref setUniform(Int, Containers::ArrayView), + * @ref uniformLocation(), @fn_gl{UseProgram}, + * @fn_gl_keyword{Uniform} or @fn_gl_keyword{ProgramUniform} */ void setUniform(Int location, Float value); void setUniform(Int location, const Math::Vector<2, Float>& value); /**< @overload */ @@ -1655,16 +1655,36 @@ class MAGNUM_GL_EXPORT AbstractShaderProgram: public AbstractObject { void setUniform(Int location, const Math::Vector<4, Float>& value); /**< @overload */ /** - * @copydoc setUniform(Int, Float) + * @brief Set an integer uniform value + * @param location Uniform location + * @param value Value + * + * If neither @gl_extension{ARB,separate_shader_objects} (part of + * OpenGL 4.1) nor @gl_extension{EXT,separate_shader_objects} OpenGL ES + * extension nor OpenGL ES 3.1 is available, the shader is marked for + * use before the operation. + * @see @ref setUniform(Int, Containers::ArrayView), + * @ref uniformLocation(), @fn_gl{UseProgram}, + * @fn_gl_keyword{Uniform} or @fn_gl_keyword{ProgramUniform} */ - void setUniform(Int location, Int value); + void setUniform(Int location, Int value); /**< @overload */ void setUniform(Int location, const Math::Vector<2, Int>& value); /**< @overload */ void setUniform(Int location, const Math::Vector<3, Int>& value); /**< @overload */ void setUniform(Int location, const Math::Vector<4, Int>& value); /**< @overload */ #ifndef MAGNUM_TARGET_GLES2 /** - * @copydoc setUniform(Int, Float) + * @brief Set an unsigned integer uniform value + * @param location Uniform location + * @param value Value + * + * If neither @gl_extension{ARB,separate_shader_objects} (part of + * OpenGL 4.1) nor @gl_extension{EXT,separate_shader_objects} OpenGL ES + * extension nor OpenGL ES 3.1 is available, the shader is marked for + * use before the operation. + * @see @ref setUniform(Int, Containers::ArrayView), + * @ref uniformLocation(), @fn_gl{UseProgram}, + * @fn_gl_keyword{Uniform} or @fn_gl_keyword{ProgramUniform} * @requires_gl30 Extension @gl_extension{EXT,gpu_shader4} * @requires_gles30 Only signed integers are available in OpenGL ES 2.0. * @requires_webgl20 Only signed integers are available in WebGL 1.0. @@ -1677,7 +1697,17 @@ class MAGNUM_GL_EXPORT AbstractShaderProgram: public AbstractObject { #ifndef MAGNUM_TARGET_GLES /** - * @copydoc setUniform(Int, Float) + * @brief Set a double uniform value + * @param location Uniform location + * @param value Value + * + * If neither @gl_extension{ARB,separate_shader_objects} (part of + * OpenGL 4.1) nor @gl_extension{EXT,separate_shader_objects} OpenGL ES + * extension nor OpenGL ES 3.1 is available, the shader is marked for + * use before the operation. + * @see @ref setUniform(Int, Containers::ArrayView), + * @ref uniformLocation(), @fn_gl{UseProgram}, + * @fn_gl_keyword{Uniform} or @fn_gl_keyword{ProgramUniform} * @requires_gl40 Extension @gl_extension{ARB,gpu_shader_fp64} * @requires_gl Only floats are available in OpenGL ES or WebGL. */ @@ -1688,7 +1718,7 @@ class MAGNUM_GL_EXPORT AbstractShaderProgram: public AbstractObject { #endif /** - * @brief Set uniform values + * @brief Set float uniform values * @param location Uniform location * @param values Values * @@ -1696,7 +1726,7 @@ class MAGNUM_GL_EXPORT AbstractShaderProgram: public AbstractObject { * OpenGL 4.1) nor @gl_extension{EXT,separate_shader_objects} OpenGL ES * extension nor OpenGL ES 3.1 is available, the shader is marked for * use before the operation. - * @see @ref setUniform(Int, const T&), @ref uniformLocation(), + * @see @ref setUniform(Int, Float), @ref uniformLocation(), * @fn_gl{UseProgram}, @fn_gl_keyword{Uniform} or * @fn_gl_keyword{ProgramUniform} */ @@ -1705,7 +1735,19 @@ class MAGNUM_GL_EXPORT AbstractShaderProgram: public AbstractObject { void setUniform(Int location, Containers::ArrayView> values); /**< @overload */ void setUniform(Int location, Containers::ArrayView> values); /**< @overload */ - /** @copydoc setUniform(Int, Containers::ArrayView) */ + /** + * @brief Set integer uniform values + * @param location Uniform location + * @param values Values + * + * If neither @gl_extension{ARB,separate_shader_objects} (part of + * OpenGL 4.1) nor @gl_extension{EXT,separate_shader_objects} OpenGL ES + * extension nor OpenGL ES 3.1 is available, the shader is marked for + * use before the operation. + * @see @ref setUniform(Int, Int), @ref uniformLocation(), + * @fn_gl{UseProgram}, @fn_gl_keyword{Uniform} or + * @fn_gl_keyword{ProgramUniform} + */ void setUniform(Int location, Containers::ArrayView values); void setUniform(Int location, Containers::ArrayView> values); /**< @overload */ void setUniform(Int location, Containers::ArrayView> values); /**< @overload */ @@ -1713,7 +1755,17 @@ class MAGNUM_GL_EXPORT AbstractShaderProgram: public AbstractObject { #ifndef MAGNUM_TARGET_GLES2 /** - * @copydoc setUniform(Int, Containers::ArrayView) + * @brief Set unsigned integer uniform values + * @param location Uniform location + * @param values Values + * + * If neither @gl_extension{ARB,separate_shader_objects} (part of + * OpenGL 4.1) nor @gl_extension{EXT,separate_shader_objects} OpenGL ES + * extension nor OpenGL ES 3.1 is available, the shader is marked for + * use before the operation. + * @see @ref setUniform(Int, UnsignedInt), @ref uniformLocation(), + * @fn_gl{UseProgram}, @fn_gl_keyword{Uniform} or + * @fn_gl_keyword{ProgramUniform} * @requires_gl30 Extension @gl_extension{EXT,gpu_shader4} * @requires_gles30 Only signed integers are available in OpenGL ES 2.0. * @requires_webgl20 Only signed integers are available in WebGL 1.0. @@ -1726,7 +1778,17 @@ class MAGNUM_GL_EXPORT AbstractShaderProgram: public AbstractObject { #ifndef MAGNUM_TARGET_GLES /** - * @copydoc setUniform(Int, Containers::ArrayView) + * @brief Set double uniform values + * @param location Uniform location + * @param values Values + * + * If neither @gl_extension{ARB,separate_shader_objects} (part of + * OpenGL 4.1) nor @gl_extension{EXT,separate_shader_objects} OpenGL ES + * extension nor OpenGL ES 3.1 is available, the shader is marked for + * use before the operation. + * @see @ref setUniform(Int, Double), @ref uniformLocation(), + * @fn_gl{UseProgram}, @fn_gl_keyword{Uniform} or + * @fn_gl_keyword{ProgramUniform} * @requires_gl40 Extension @gl_extension{ARB,gpu_shader_fp64} * @requires_gl Only floats are available in OpenGL ES or WebGL. */ @@ -1736,14 +1798,58 @@ class MAGNUM_GL_EXPORT AbstractShaderProgram: public AbstractObject { void setUniform(Int location, Containers::ArrayView> values); /**< @overload */ #endif - /** @copydoc setUniform(Int, Containers::ArrayView) */ + /** + * @brief Set a float matrix uniform value + * @param location Uniform location + * @param value Value + * + * If neither @gl_extension{ARB,separate_shader_objects} (part of + * OpenGL 4.1) nor @gl_extension{EXT,separate_shader_objects} OpenGL ES + * extension nor OpenGL ES 3.1 is available, the shader is marked for + * use before the operation. + * @see @ref setUniform(Int, Float), @ref uniformLocation(), + * @fn_gl{UseProgram}, @fn_gl_keyword{Uniform} or + * @fn_gl_keyword{ProgramUniform} + * @requires_gles30 Only square matrices are available in OpenGL ES 2.0. + * @requires_webgl20 Only square matrices are available in WebGL 1.0. + * @requires_gl40 Extension @gl_extension{ARB,gpu_shader_fp64} for + * doubles. + * @requires_gl Only floats are available in OpenGL ES or WebGL. + */ + template void setUniform(Int location, const Math::RectangularMatrix& value) { + setUniform(location, {&value, 1}); + } + + /** + * @brief Set float matrix uniform values + * @param location Uniform location + * @param values Values + * + * If neither @gl_extension{ARB,separate_shader_objects} (part of + * OpenGL 4.1) nor @gl_extension{EXT,separate_shader_objects} OpenGL ES + * extension nor OpenGL ES 3.1 is available, the shader is marked for + * use before the operation. + * @see @ref setUniform(Int, Float), @ref uniformLocation(), + * @fn_gl{UseProgram}, @fn_gl_keyword{Uniform} or + * @fn_gl_keyword{ProgramUniform} + */ void setUniform(Int location, Containers::ArrayView> values); void setUniform(Int location, Containers::ArrayView> values); /**< @overload */ void setUniform(Int location, Containers::ArrayView> values); /**< @overload */ #ifndef MAGNUM_TARGET_GLES2 /** - * @copydoc setUniform(Int, Containers::ArrayView) + * @brief Set rectangular float matrix uniform values + * @param location Uniform location + * @param values Values + * + * If neither @gl_extension{ARB,separate_shader_objects} (part of + * OpenGL 4.1) nor @gl_extension{EXT,separate_shader_objects} OpenGL ES + * extension nor OpenGL ES 3.1 is available, the shader is marked for + * use before the operation. + * @see @ref setUniform(Int, Float), @ref uniformLocation(), + * @fn_gl{UseProgram}, @fn_gl_keyword{Uniform} or + * @fn_gl_keyword{ProgramUniform} * @requires_gles30 Only square matrices are available in OpenGL ES 2.0. * @requires_webgl20 Only square matrices are available in WebGL 1.0. */ @@ -1757,7 +1863,17 @@ class MAGNUM_GL_EXPORT AbstractShaderProgram: public AbstractObject { #ifndef MAGNUM_TARGET_GLES /** - * @copydoc setUniform(Int, Containers::ArrayView) + * @brief Set double matrix uniform values + * @param location Uniform location + * @param values Values + * + * If neither @gl_extension{ARB,separate_shader_objects} (part of + * OpenGL 4.1) nor @gl_extension{EXT,separate_shader_objects} OpenGL ES + * extension nor OpenGL ES 3.1 is available, the shader is marked for + * use before the operation. + * @see @ref setUniform(Int, Float), @ref uniformLocation(), + * @fn_gl{UseProgram}, @fn_gl_keyword{Uniform} or + * @fn_gl_keyword{ProgramUniform} * @requires_gl40 Extension @gl_extension{ARB,gpu_shader_fp64} * @requires_gl Only floats are available in OpenGL ES or WebGL. */ diff --git a/src/Magnum/GL/Implementation/ShaderProgramState.cpp b/src/Magnum/GL/Implementation/ShaderProgramState.cpp index 785083e5d..fabfdf39a 100644 --- a/src/Magnum/GL/Implementation/ShaderProgramState.cpp +++ b/src/Magnum/GL/Implementation/ShaderProgramState.cpp @@ -3,6 +3,8 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš + Copyright © 2022 Vladislav Oleshko + Copyright @ 2022 Hugo Amiard Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/GL/Implementation/ShaderProgramState.h b/src/Magnum/GL/Implementation/ShaderProgramState.h index 2f05f93c7..f5473374a 100644 --- a/src/Magnum/GL/Implementation/ShaderProgramState.h +++ b/src/Magnum/GL/Implementation/ShaderProgramState.h @@ -5,6 +5,8 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš + Copyright © 2022 Vladislav Oleshko + Copyright @ 2022 Hugo Amiard Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/GL/Implementation/ShaderState.cpp b/src/Magnum/GL/Implementation/ShaderState.cpp index 17758a801..b000e6f14 100644 --- a/src/Magnum/GL/Implementation/ShaderState.cpp +++ b/src/Magnum/GL/Implementation/ShaderState.cpp @@ -3,6 +3,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš + Copyright © 2022 Vladislav Oleshko Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/GL/Implementation/ShaderState.h b/src/Magnum/GL/Implementation/ShaderState.h index 4d37c764d..f4ad5e502 100644 --- a/src/Magnum/GL/Implementation/ShaderState.h +++ b/src/Magnum/GL/Implementation/ShaderState.h @@ -5,6 +5,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš + Copyright © 2022 Vladislav Oleshko Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/GL/Shader.cpp b/src/Magnum/GL/Shader.cpp index 3167ffe0e..721caad30 100644 --- a/src/Magnum/GL/Shader.cpp +++ b/src/Magnum/GL/Shader.cpp @@ -3,7 +3,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš - Copyright © Vladislav Oleshko + Copyright © 2022 Vladislav Oleshko Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/GL/Shader.h b/src/Magnum/GL/Shader.h index da8943c44..3dc067e77 100644 --- a/src/Magnum/GL/Shader.h +++ b/src/Magnum/GL/Shader.h @@ -5,7 +5,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš - Copyright © Vladislav Oleshko + Copyright © 2022 Vladislav Oleshko Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/Shaders/DistanceFieldVectorGL.cpp b/src/Magnum/Shaders/DistanceFieldVectorGL.cpp index 9b852be30..94519c22b 100644 --- a/src/Magnum/Shaders/DistanceFieldVectorGL.cpp +++ b/src/Magnum/Shaders/DistanceFieldVectorGL.cpp @@ -3,7 +3,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš - Copyright © Vladislav Oleshko + Copyright © 2022 Vladislav Oleshko Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/Shaders/DistanceFieldVectorGL.h b/src/Magnum/Shaders/DistanceFieldVectorGL.h index 36f087e87..d40e4b21a 100644 --- a/src/Magnum/Shaders/DistanceFieldVectorGL.h +++ b/src/Magnum/Shaders/DistanceFieldVectorGL.h @@ -5,7 +5,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš - Copyright © Vladislav Oleshko + Copyright © 2022 Vladislav Oleshko Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/Shaders/FlatGL.cpp b/src/Magnum/Shaders/FlatGL.cpp index 2bc1cb68e..21483822e 100644 --- a/src/Magnum/Shaders/FlatGL.cpp +++ b/src/Magnum/Shaders/FlatGL.cpp @@ -3,7 +3,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš - Copyright © Vladislav Oleshko + Copyright © 2022 Vladislav Oleshko Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/Shaders/FlatGL.h b/src/Magnum/Shaders/FlatGL.h index adedb7c82..01a5e8964 100644 --- a/src/Magnum/Shaders/FlatGL.h +++ b/src/Magnum/Shaders/FlatGL.h @@ -5,7 +5,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš - Copyright © Vladislav Oleshko + Copyright © 2022 Vladislav Oleshko Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/Shaders/MeshVisualizerGL.cpp b/src/Magnum/Shaders/MeshVisualizerGL.cpp index 7a093c2ee..ddbbde5ad 100644 --- a/src/Magnum/Shaders/MeshVisualizerGL.cpp +++ b/src/Magnum/Shaders/MeshVisualizerGL.cpp @@ -3,7 +3,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš - Copyright © Vladislav Oleshko + Copyright © 2022 Vladislav Oleshko Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/Shaders/MeshVisualizerGL.h b/src/Magnum/Shaders/MeshVisualizerGL.h index cbf503757..82d57599a 100644 --- a/src/Magnum/Shaders/MeshVisualizerGL.h +++ b/src/Magnum/Shaders/MeshVisualizerGL.h @@ -5,7 +5,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš - Copyright © Vladislav Oleshko + Copyright © 2022 Vladislav Oleshko Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/Shaders/PhongGL.cpp b/src/Magnum/Shaders/PhongGL.cpp index 6d1aaa13b..2777338a2 100644 --- a/src/Magnum/Shaders/PhongGL.cpp +++ b/src/Magnum/Shaders/PhongGL.cpp @@ -3,7 +3,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš - Copyright © Vladislav Oleshko + Copyright © 2022 Vladislav Oleshko Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/Shaders/PhongGL.h b/src/Magnum/Shaders/PhongGL.h index 12396bc30..9c0e46610 100644 --- a/src/Magnum/Shaders/PhongGL.h +++ b/src/Magnum/Shaders/PhongGL.h @@ -5,7 +5,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš - Copyright © Vladislav Oleshko + Copyright © 2022 Vladislav Oleshko Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp b/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp index f81bd17aa..1a3a0d3df 100644 --- a/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp +++ b/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp @@ -3,7 +3,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš - Copyright © Vladislav Oleshko + Copyright © 2022 Vladislav Oleshko Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/Shaders/Test/FlatGLTest.cpp b/src/Magnum/Shaders/Test/FlatGLTest.cpp index 60198e313..236161dcc 100644 --- a/src/Magnum/Shaders/Test/FlatGLTest.cpp +++ b/src/Magnum/Shaders/Test/FlatGLTest.cpp @@ -3,7 +3,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš - Copyright © Vladislav Oleshko + Copyright © 2022 Vladislav Oleshko Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp index 5c091d384..1e372b2fb 100644 --- a/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp +++ b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp @@ -3,7 +3,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš - Copyright © Vladislav Oleshko + Copyright © 2022 Vladislav Oleshko Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/Shaders/Test/PhongGLTest.cpp b/src/Magnum/Shaders/Test/PhongGLTest.cpp index 6248629cc..4f19f385f 100644 --- a/src/Magnum/Shaders/Test/PhongGLTest.cpp +++ b/src/Magnum/Shaders/Test/PhongGLTest.cpp @@ -3,7 +3,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš - Copyright © Vladislav Oleshko + Copyright © 2022 Vladislav Oleshko Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/Shaders/Test/VectorGLTest.cpp b/src/Magnum/Shaders/Test/VectorGLTest.cpp index bc7b560ed..176367f22 100644 --- a/src/Magnum/Shaders/Test/VectorGLTest.cpp +++ b/src/Magnum/Shaders/Test/VectorGLTest.cpp @@ -3,7 +3,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš - Copyright © Vladislav Oleshko + Copyright © 2022 Vladislav Oleshko Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/Shaders/VectorGL.cpp b/src/Magnum/Shaders/VectorGL.cpp index f06d5cba4..c85da1339 100644 --- a/src/Magnum/Shaders/VectorGL.cpp +++ b/src/Magnum/Shaders/VectorGL.cpp @@ -3,7 +3,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš - Copyright © Vladislav Oleshko + Copyright © 2022 Vladislav Oleshko Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/Shaders/VectorGL.h b/src/Magnum/Shaders/VectorGL.h index 5196ce5da..b7c8cc71d 100644 --- a/src/Magnum/Shaders/VectorGL.h +++ b/src/Magnum/Shaders/VectorGL.h @@ -5,7 +5,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš - Copyright © Vladislav Oleshko + Copyright © 2022 Vladislav Oleshko Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/Shaders/VertexColorGL.cpp b/src/Magnum/Shaders/VertexColorGL.cpp index 77907b903..c6cba2800 100644 --- a/src/Magnum/Shaders/VertexColorGL.cpp +++ b/src/Magnum/Shaders/VertexColorGL.cpp @@ -3,7 +3,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš - Copyright © Vladislav Oleshko + Copyright © 2022 Vladislav Oleshko Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/Shaders/VertexColorGL.h b/src/Magnum/Shaders/VertexColorGL.h index d09e95bdd..d6b4ac6ee 100644 --- a/src/Magnum/Shaders/VertexColorGL.h +++ b/src/Magnum/Shaders/VertexColorGL.h @@ -5,7 +5,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Vladimír Vondruš - Copyright © Vladislav Oleshko + Copyright © 2022 Vladislav Oleshko Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),