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.
10301 Commits
21 Branches
19 Tags
70 MiB
Tree: f1df71a000
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'f1df71a000'
${ noResults }
magnum/src/Magnum/Shaders/VectorGL.cpp

421 lines
18 KiB
Raw Normal View History Unescape

Shaders: basic text shader.
14 years ago
/*
This file is part of Magnum.
Updated copyright year.
6 years ago
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
Updated copyright year.
4 years ago
2020, 2021, 2022 Vladimír Vondruš <mosra@centrum.cz>
Doc++, updated changelog.
4 years ago
Copyright © 2022 Vladislav Oleshko <vladislav.oleshko@gmail.com>
Relicensing to MIT/Expat license, part 3: source files. Added license header also to shader sources. Hopefully it won't harm compilation times too much.
13 years ago
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
Shaders: basic text shader.
14 years ago
*/
Shaders: suffix all existing shaders with GL. To make room for Vulkan shaders. Also renaming the headers, of course everything is still aliased to the old names (and marked as deprecated).
5 years ago
#include "VectorGL.h"
Shaders: basic text shader.
14 years ago
Shaders: implement texture coordinate transformation for all shaders. Except MeshVisualizer and VertexColor, which don't have any texturing, so there it's not needed. In most cases the tests are reusing existing ground truth files and only modifying transformations / flipping images.
6 years ago
#include <Corrade/Containers/EnumSet.hpp>
GL: better handle a case of async link failures. The new async APIs were just checking the link status, and printing the linker error. Because drivers commonly do all that in a single step, without really separating compilation from linking (or at least that's what I thought?), I assumed the linker error would contain *also* the compilation error, if any. But on a quick check with Mesa that's not the case, I only get "error: linking with uncompiled/unspecialized shader", which is very useless. Which means, to get proper error output, the checkLink() function now explicitly takes a list of the input shaders. It will unconditionally go through them at the beginning and call checkCompile() on each. To further encourage the shaders to be passed, there's no default argument -- so if the application calls checkCompile() on its own for some reason, it has to pass an empty list to checkLink().
4 years ago
#include <Corrade/Containers/Iterable.h>
Making includes absolute, part 4: using absolute includes for Corrade. Also adapted to some Corrade renames.
12 years ago
#include <Corrade/Utility/Resource.h>
Shaders: basic text shader.
14 years ago
Split the OpenGL layer out, pt 20: adapted Shaders.
8 years ago
#include "Magnum/GL/Context.h"
#include "Magnum/GL/Extensions.h"
#include "Magnum/GL/Shader.h"
Shaders: remove the AbstractVector base. 167 additions, 341 deletions. I think that speaks for itself about benefits of this base class.
5 years ago
#include "Magnum/GL/Texture.h"
Shaders: de-inline uniform setters. Reduces includes in the header quite a lot, yay.
7 years ago
#include "Magnum/Math/Color.h"
#include "Magnum/Math/Matrix3.h"
#include "Magnum/Math/Matrix4.h"
Shaders: basic text shader.
14 years ago
Shaders: add UBO support to all shaders.
5 years ago
#ifndef MAGNUM_TARGET_GLES2
GL: port Shader and ShaderProgram away from std::string. Same as in the previous commit, most cases are inputs so a StringStl.h compatibility include will do, the only breaking change is GL::Shader::sources() which now returns a StringIterable instead of a std::vector<std::string> (ew). Awesome about this whole thing is that The Shader API now allows creating a shader from sources coming either from string view literals or Utility::Resource completely without having to allocate any strings internally, because all those can be just non-owning references wrapped with String::nullTerminatedGlobalView(). The only parts which aren't references are the #line markers, but (especially on 64bit) those can easily fit into the 22-byte (or 10-byte on 32bit) SSO storage. Also, various Shader constructors and assignment operators had to be deinlined in order to avoid having to include the String header, which would be needed for Array destruction during a move. Co-authored-by: Hugo Amiard <hugo.amiard@wonderlandengine.com>
3 years ago
#include <Corrade/Containers/String.h>
#include <Corrade/Utility/Format.h>
Shaders: add UBO support to all shaders.
5 years ago
#include "Magnum/GL/Buffer.h"
#endif
Split the OpenGL layer out, pt 20: adapted Shaders.
8 years ago
#include "Magnum/Shaders/Implementation/CreateCompatibilityShader.h"
Shader: more robust extension presence checking. Propagate the information about whether given extension is disabled to GLSL instead of doing the guesswork again from scratch.
12 years ago
Shaders: basic text shader.
14 years ago
namespace Magnum { namespace Shaders {
DebugTools,Shaders,TextureTools: use string view literals everywhere. Mainly important for Shader::addSource() to prevent it from creating a needless copy, but doesn't hurt to do the same also for uniformLocation(), bindAttributeLocation() etc. -- it'll avoid a runtime strlen() in that case at least.
3 years ago
using namespace Containers::Literals;
Shaders: remove the AbstractVector base. 167 additions, 341 deletions. I think that speaks for itself about benefits of this base class.
5 years ago
namespace {
enum: Int { TextureUnit = 6 };
Shaders: add UBO support to all shaders.
5 years ago
#ifndef MAGNUM_TARGET_GLES2
enum: Int {
/* Not using the zero binding to avoid conflicts with
ProjectionBufferBinding from other shaders which can likely stay
bound to the same buffer for the whole time */
TransformationProjectionBufferBinding = 1,
DrawBufferBinding = 2,
Shaders: supply Vector material information in a separate UBO as well. So it's all having the same workflow. This one results in even more saved UBO slots per-draw than in the case of Flat, and the slowdown on Intel is as bad as expected.
5 years ago
TextureTransformationBufferBinding = 3,
MaterialBufferBinding = 4
Shaders: add UBO support to all shaders.
5 years ago
};
#endif
Shaders: remove the AbstractVector base. 167 additions, 341 deletions. I think that speaks for itself about benefits of this base class.
5 years ago
}
Shaders: take constructor arguments via a Configuration instance. Because it was no longer bearable with three UnsignedInt arguments in a row, especially when some of them are only available on a subset of platforms. And it would get even worse with introduction of planned features such as multiview or skinning. Backwards compatibility is in place, as always. To ensure nothing breaks, this commit still has all tests and snippets using the old API.
4 years ago
template<UnsignedInt dimensions> typename VectorGL<dimensions>::CompileState VectorGL<dimensions>::compile(const Configuration& configuration) {
Shaders: add UBO support to all shaders.
5 years ago
#ifndef MAGNUM_TARGET_GLES2
Shaders: take constructor arguments via a Configuration instance. Because it was no longer bearable with three UnsignedInt arguments in a row, especially when some of them are only available on a subset of platforms. And it would get even worse with introduction of planned features such as multiview or skinning. Backwards compatibility is in place, as always. To ensure nothing breaks, this commit still has all tests and snippets using the old API.
4 years ago
CORRADE_ASSERT(!(configuration.flags() >= Flag::UniformBuffers) || configuration.materialCount(),
Shaders: implement async shader compilation for all shaders.
4 years ago
"Shaders::VectorGL: material count can't be zero", CompileState{NoCreate});
Shaders: take constructor arguments via a Configuration instance. Because it was no longer bearable with three UnsignedInt arguments in a row, especially when some of them are only available on a subset of platforms. And it would get even worse with introduction of planned features such as multiview or skinning. Backwards compatibility is in place, as always. To ensure nothing breaks, this commit still has all tests and snippets using the old API.
4 years ago
CORRADE_ASSERT(!(configuration.flags() >= Flag::UniformBuffers) || configuration.drawCount(),
Shaders: implement async shader compilation for all shaders.
4 years ago
"Shaders::VectorGL: draw count can't be zero", CompileState{NoCreate});
Shaders: add UBO support to all shaders.
5 years ago
#endif
#ifndef MAGNUM_TARGET_GLES
Shaders: take constructor arguments via a Configuration instance. Because it was no longer bearable with three UnsignedInt arguments in a row, especially when some of them are only available on a subset of platforms. And it would get even worse with introduction of planned features such as multiview or skinning. Backwards compatibility is in place, as always. To ensure nothing breaks, this commit still has all tests and snippets using the old API.
4 years ago
if(configuration.flags() >= Flag::UniformBuffers)
Shaders: add UBO support to all shaders.
5 years ago
MAGNUM_ASSERT_GL_EXTENSION_SUPPORTED(GL::Extensions::ARB::uniform_buffer_object);
#endif
Shaders: multidraw support in all builtin shaders.
5 years ago
#ifndef MAGNUM_TARGET_GLES2
Shaders: take constructor arguments via a Configuration instance. Because it was no longer bearable with three UnsignedInt arguments in a row, especially when some of them are only available on a subset of platforms. And it would get even worse with introduction of planned features such as multiview or skinning. Backwards compatibility is in place, as always. To ensure nothing breaks, this commit still has all tests and snippets using the old API.
4 years ago
if(configuration.flags() >= Flag::MultiDraw) {
Shaders: multidraw support in all builtin shaders.
5 years ago
#ifndef MAGNUM_TARGET_GLES
MAGNUM_ASSERT_GL_EXTENSION_SUPPORTED(GL::Extensions::ARB::shader_draw_parameters);
#elif !defined(MAGNUM_TARGET_WEBGL)
MAGNUM_ASSERT_GL_EXTENSION_SUPPORTED(GL::Extensions::ANGLE::multi_draw);
#else
MAGNUM_ASSERT_GL_EXTENSION_SUPPORTED(GL::Extensions::WEBGL::multi_draw);
#endif
}
#endif
Shaders: add UBO support to all shaders.
5 years ago
Better handling of compiled-in resources in static build. Each class/function that needs to access the resources first checks whether the group exists and the group is registered if not. Thus there is now no difference and annoying special cases when using static build.
11 years ago
#ifdef MAGNUM_BUILD_STATIC
/* Import resources on static build, if not already */
DebugTools,Shaders,TextureTools: use string view literals everywhere. Mainly important for Shader::addSource() to prevent it from creating a needless copy, but doesn't hurt to do the same also for uniformLocation(), bindAttributeLocation() etc. -- it'll avoid a runtime strlen() in that case at least.
3 years ago
if(!Utility::Resource::hasGroup("MagnumShadersGL"_s))
Better handling of compiled-in resources in static build. Each class/function that needs to access the resources first checks whether the group exists and the group is registered if not. Thus there is now no difference and annoying special cases when using static build.
11 years ago
importShaderResources();
#endif
DebugTools,Shaders,TextureTools: use string view literals everywhere. Mainly important for Shader::addSource() to prevent it from creating a needless copy, but doesn't hurt to do the same also for uniformLocation(), bindAttributeLocation() etc. -- it'll avoid a runtime strlen() in that case at least.
3 years ago
Utility::Resource rs("MagnumShadersGL"_s);
Shaders: basic text shader.
14 years ago
Shaders: avoid repeated GL::Context::current() calls. It involves a TLS lookup each time and it's just unnecessary extra typing.
5 years ago
const GL::Context& context = GL::Context::current();
Shaders: basic text shader.
14 years ago
#ifndef MAGNUM_TARGET_GLES
Shaders: avoid repeated GL::Context::current() calls. It involves a TLS lookup each time and it's just unnecessary extra typing.
5 years ago
const GL::Version version = context.supportedVersion({GL::Version::GL320, GL::Version::GL310, GL::Version::GL300, GL::Version::GL210});
Shaders: basic text shader.
14 years ago
#else
Shaders: don't format & pass _LOCATION defines on ES < 3.1 and WebGL. Saves quite a few unnecessary allocations and string operations.
3 years ago
const GL::Version version = context.supportedVersion({
#ifndef MAGNUM_TARGET_WEBGL
GL::Version::GLES310,
#endif
GL::Version::GLES300, GL::Version::GLES200});
Shaders: basic text shader.
14 years ago
#endif
Split the OpenGL layer out, pt 20: adapted Shaders.
8 years ago
GL::Shader vert = Implementation::createCompatibilityShader(rs, version, GL::Shader::Type::Vertex);
DebugTools,Shaders,TextureTools: use string view literals everywhere. Mainly important for Shader::addSource() to prevent it from creating a needless copy, but doesn't hurt to do the same also for uniformLocation(), bindAttributeLocation() etc. -- it'll avoid a runtime strlen() in that case at least.
3 years ago
vert.addSource(configuration.flags() & Flag::TextureTransformation ? "#define TEXTURE_TRANSFORMATION\n"_s : ""_s)
.addSource(dimensions == 2 ? "#define TWO_DIMENSIONS\n"_s : "#define THREE_DIMENSIONS\n"_s);
Shaders: add UBO support to all shaders.
5 years ago
#ifndef MAGNUM_TARGET_GLES2
Shaders: take constructor arguments via a Configuration instance. Because it was no longer bearable with three UnsignedInt arguments in a row, especially when some of them are only available on a subset of platforms. And it would get even worse with introduction of planned features such as multiview or skinning. Backwards compatibility is in place, as always. To ensure nothing breaks, this commit still has all tests and snippets using the old API.
4 years ago
if(configuration.flags() >= Flag::UniformBuffers) {
GL: port Shader and ShaderProgram away from std::string. Same as in the previous commit, most cases are inputs so a StringStl.h compatibility include will do, the only breaking change is GL::Shader::sources() which now returns a StringIterable instead of a std::vector<std::string> (ew). Awesome about this whole thing is that The Shader API now allows creating a shader from sources coming either from string view literals or Utility::Resource completely without having to allocate any strings internally, because all those can be just non-owning references wrapped with String::nullTerminatedGlobalView(). The only parts which aren't references are the #line markers, but (especially on 64bit) those can easily fit into the 22-byte (or 10-byte on 32bit) SSO storage. Also, various Shader constructors and assignment operators had to be deinlined in order to avoid having to include the String header, which would be needed for Array destruction during a move. Co-authored-by: Hugo Amiard <hugo.amiard@wonderlandengine.com>
3 years ago
vert.addSource(Utility::format(
Shaders: add UBO support to all shaders.
5 years ago
"#define UNIFORM_BUFFERS\n"
"#define DRAW_COUNT {}\n",
Shaders: take constructor arguments via a Configuration instance. Because it was no longer bearable with three UnsignedInt arguments in a row, especially when some of them are only available on a subset of platforms. And it would get even worse with introduction of planned features such as multiview or skinning. Backwards compatibility is in place, as always. To ensure nothing breaks, this commit still has all tests and snippets using the old API.
4 years ago
configuration.drawCount()));
DebugTools,Shaders,TextureTools: use string view literals everywhere. Mainly important for Shader::addSource() to prevent it from creating a needless copy, but doesn't hurt to do the same also for uniformLocation(), bindAttributeLocation() etc. -- it'll avoid a runtime strlen() in that case at least.
3 years ago
vert.addSource(configuration.flags() >= Flag::MultiDraw ? "#define MULTI_DRAW\n"_s : ""_s);
Shaders: add UBO support to all shaders.
5 years ago
}
#endif
DebugTools,Shaders,TextureTools: use string view literals everywhere. Mainly important for Shader::addSource() to prevent it from creating a needless copy, but doesn't hurt to do the same also for uniformLocation(), bindAttributeLocation() etc. -- it'll avoid a runtime strlen() in that case at least.
3 years ago
vert.addSource(rs.getString("generic.glsl"_s))
Shaders: group whole vertex/fragment shader setup together.
3 years ago
.addSource(rs.getString("Vector.vert"_s))
.submitCompile();
GL::Shader frag = Implementation::createCompatibilityShader(rs, version, GL::Shader::Type::Fragment);
Shaders: add UBO support to all shaders.
5 years ago
#ifndef MAGNUM_TARGET_GLES2
Shaders: take constructor arguments via a Configuration instance. Because it was no longer bearable with three UnsignedInt arguments in a row, especially when some of them are only available on a subset of platforms. And it would get even worse with introduction of planned features such as multiview or skinning. Backwards compatibility is in place, as always. To ensure nothing breaks, this commit still has all tests and snippets using the old API.
4 years ago
if(configuration.flags() >= Flag::UniformBuffers) {
GL: port Shader and ShaderProgram away from std::string. Same as in the previous commit, most cases are inputs so a StringStl.h compatibility include will do, the only breaking change is GL::Shader::sources() which now returns a StringIterable instead of a std::vector<std::string> (ew). Awesome about this whole thing is that The Shader API now allows creating a shader from sources coming either from string view literals or Utility::Resource completely without having to allocate any strings internally, because all those can be just non-owning references wrapped with String::nullTerminatedGlobalView(). The only parts which aren't references are the #line markers, but (especially on 64bit) those can easily fit into the 22-byte (or 10-byte on 32bit) SSO storage. Also, various Shader constructors and assignment operators had to be deinlined in order to avoid having to include the String header, which would be needed for Array destruction during a move. Co-authored-by: Hugo Amiard <hugo.amiard@wonderlandengine.com>
3 years ago
frag.addSource(Utility::format(
Shaders: add UBO support to all shaders.
5 years ago
"#define UNIFORM_BUFFERS\n"
Shaders: supply Vector material information in a separate UBO as well. So it's all having the same workflow. This one results in even more saved UBO slots per-draw than in the case of Flat, and the slowdown on Intel is as bad as expected.
5 years ago
"#define DRAW_COUNT {}\n"
"#define MATERIAL_COUNT {}\n",
Shaders: take constructor arguments via a Configuration instance. Because it was no longer bearable with three UnsignedInt arguments in a row, especially when some of them are only available on a subset of platforms. And it would get even worse with introduction of planned features such as multiview or skinning. Backwards compatibility is in place, as always. To ensure nothing breaks, this commit still has all tests and snippets using the old API.
4 years ago
configuration.drawCount(),
configuration.materialCount()));
DebugTools,Shaders,TextureTools: use string view literals everywhere. Mainly important for Shader::addSource() to prevent it from creating a needless copy, but doesn't hurt to do the same also for uniformLocation(), bindAttributeLocation() etc. -- it'll avoid a runtime strlen() in that case at least.
3 years ago
frag.addSource(configuration.flags() >= Flag::MultiDraw ? "#define MULTI_DRAW\n"_s : ""_s);
Shaders: add UBO support to all shaders.
5 years ago
}
#endif
DebugTools,Shaders,TextureTools: use string view literals everywhere. Mainly important for Shader::addSource() to prevent it from creating a needless copy, but doesn't hurt to do the same also for uniformLocation(), bindAttributeLocation() etc. -- it'll avoid a runtime strlen() in that case at least.
3 years ago
frag.addSource(rs.getString("generic.glsl"_s))
Shaders: group whole vertex/fragment shader setup together.
3 years ago
.addSource(rs.getString("Vector.frag"_s))
.submitCompile();
Shaders: implement async shader compilation for all shaders.
4 years ago
VectorGL out{NoInit};
Shaders: take constructor arguments via a Configuration instance. Because it was no longer bearable with three UnsignedInt arguments in a row, especially when some of them are only available on a subset of platforms. And it would get even worse with introduction of planned features such as multiview or skinning. Backwards compatibility is in place, as always. To ensure nothing breaks, this commit still has all tests and snippets using the old API.
4 years ago
out._flags = configuration.flags();
Shaders: implement async shader compilation for all shaders.
4 years ago
#ifndef MAGNUM_TARGET_GLES2
Shaders: take constructor arguments via a Configuration instance. Because it was no longer bearable with three UnsignedInt arguments in a row, especially when some of them are only available on a subset of platforms. And it would get even worse with introduction of planned features such as multiview or skinning. Backwards compatibility is in place, as always. To ensure nothing breaks, this commit still has all tests and snippets using the old API.
4 years ago
out._materialCount = configuration.materialCount();
out._drawCount = configuration.drawCount();
Shaders: implement async shader compilation for all shaders.
4 years ago
#endif
Shaders: making use of parallel compilation. Compiling fragment and vertex shader simultaenously, at least. Nothing more can be done for now. Also removed weird duplicate compile/link calls from MeshVisualizer, went unnoticed since b9a72bd3d1fd2bf763ca43a8cde7726583b671c2. Why did I do that?!
12 years ago
Shaders: implement async shader compilation for all shaders.
4 years ago
out.attachShaders({vert, frag});
Shaders: basic text shader.
14 years ago
Shaders: don't test for ES3 at runtime. This only generates code that will be never executed. Tested with Flat and Phong, the other shaders don't have rendering tests yet but since the change is the same, I assume it will work there as well.
7 years ago
/* ES3 has this done in the shader directly */
#if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_GLES2)
Shaders: basic text shader.
14 years ago
#ifndef MAGNUM_TARGET_GLES
Shaders: avoid repeated GL::Context::current() calls. It involves a TLS lookup each time and it's just unnecessary extra typing.
5 years ago
if(!context.isExtensionSupported<GL::Extensions::ARB::explicit_attrib_location>(version))
Shaders: basic text shader.
14 years ago
#endif
Shaders: minor tweaks. Non-matching number of opening and closing braces confused editors with code folding feature.
13 years ago
{
DebugTools,Shaders,TextureTools: use string view literals everywhere. Mainly important for Shader::addSource() to prevent it from creating a needless copy, but doesn't hurt to do the same also for uniformLocation(), bindAttributeLocation() etc. -- it'll avoid a runtime strlen() in that case at least.
3 years ago
out.bindAttributeLocation(Position::Location, "position"_s);
out.bindAttributeLocation(TextureCoordinates::Location, "textureCoordinates"_s);
Shaders: basic text shader.
14 years ago
}
Shaders: don't test for ES3 at runtime. This only generates code that will be never executed. Tested with Flat and Phong, the other shaders don't have rendering tests yet but since the change is the same, I assume it will work there as well.
7 years ago
#endif
Shaders: basic text shader.
14 years ago
Shaders: implement async shader compilation for all shaders.
4 years ago
out.submitLink();
Shaders: remove CompileState members on platforms that don't need them. This fixes a bunch of Clang warnings saying that a private field is unused.
3 years ago
return CompileState{std::move(out), std::move(vert), std::move(frag)
Shaders: use explicit texture location and binding on ES3.1+. No reason not to, reduces the amount of unnecessary driver calls quite significantly.
3 years ago
#if !defined(MAGNUM_TARGET_GLES) || (!defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL))
Shaders: remove CompileState members on platforms that don't need them. This fixes a bunch of Clang warnings saying that a private field is unused.
3 years ago
, version
#endif
};
Shaders: implement async shader compilation for all shaders.
4 years ago
}
Shaders: take constructor arguments via a Configuration instance. Because it was no longer bearable with three UnsignedInt arguments in a row, especially when some of them are only available on a subset of platforms. And it would get even worse with introduction of planned features such as multiview or skinning. Backwards compatibility is in place, as always. To ensure nothing breaks, this commit still has all tests and snippets using the old API.
4 years ago
#ifdef MAGNUM_BUILD_DEPRECATED
template<UnsignedInt dimensions> typename VectorGL<dimensions>::CompileState VectorGL<dimensions>::compile(const Flags flags) {
return compile(Configuration{}
.setFlags(flags));
}
#ifndef MAGNUM_TARGET_GLES2
template<UnsignedInt dimensions> typename VectorGL<dimensions>::CompileState VectorGL<dimensions>::compile(const Flags flags, const UnsignedInt materialCount, const UnsignedInt drawCount) {
return compile(Configuration{}
.setFlags(flags)
.setMaterialCount(materialCount)
.setDrawCount(drawCount));
}
#endif
#endif
Shaders: minor cleanup & document new async compilation APIs. Apart from docs mostly just reordering declaratios, removing usage of auto and providing default arguments where missing.
4 years ago
template<UnsignedInt dimensions> VectorGL<dimensions>::VectorGL(CompileState&& state): VectorGL{static_cast<VectorGL&&>(std::move(state))} {
Shaders: the early exit is only for assertion testing, document that. I knew it had to be there, but then forgot and wanted to remove it as superfluous because such case can't happen from user code. Well...
4 years ago
#ifdef CORRADE_GRACEFUL_ASSERT
/* When graceful assertions fire from within compile(), we get a NoCreate'd
CompileState. Exiting makes it possible to test the assert. */
Shaders: minor cleanup & document new async compilation APIs. Apart from docs mostly just reordering declaratios, removing usage of auto and providing default arguments where missing.
4 years ago
if(!id()) return;
Shaders: the early exit is only for assertion testing, document that. I knew it had to be there, but then forgot and wanted to remove it as superfluous because such case can't happen from user code. Well...
4 years ago
#endif
Shaders: implement async shader compilation for all shaders.
4 years ago
Shaders: avoid including GL/Shader.h in headers. The class is rather heavy (strings, STL vector) and it'll stay heavier than strictly needed even after the planned STL cleanup -- shader users should not bear the overhead of Array, StringView etc. that it needs in order to compile the shader sources. I might eventually come to a different conclusion (maybe separating GL::Shader population and usage like doing in Vulkan with CreateInfos), but right now this commit has the best available solution -- converting the instance to a lightweight class containing just ID and type, and then converting that back to a GL::Shader upon checking compilation/link status. While at it, also removed the not-strictly-needed Optional usage from the header. It wouldn't work with forward-declared GL::Shader anyway.
4 years ago
CORRADE_INTERNAL_ASSERT_OUTPUT(checkLink({GL::Shader(state._vert), GL::Shader(state._frag)}));
Shaders: implement async shader compilation for all shaders.
4 years ago
Shaders: basic text shader.
14 years ago
#ifndef MAGNUM_TARGET_GLES
Shaders: minor cleanup. * No need to repeat the type for all variables, unnecessary redundancy. * Reducing the amount of redundant local variables and if they stay making their definitions more localized to where they get used. * All uniform setters used the "initial value is" phrase instead of "default is", this one didn't.
3 years ago
const GL::Context& context = GL::Context::current();
if(!context.isExtensionSupported<GL::Extensions::ARB::explicit_uniform_location>(state._version))
Shaders: use explicit texture location and binding on ES3.1+. No reason not to, reduces the amount of unnecessary driver calls quite significantly.
3 years ago
#elif !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL)
if(state._version < GL::Version::GLES310)
Shaders: basic text shader.
14 years ago
#endif
Shaders: minor tweaks. Non-matching number of opening and closing braces confused editors with code folding feature.
13 years ago
{
Shaders: add UBO support to all shaders.
5 years ago
#ifndef MAGNUM_TARGET_GLES2
Shaders: implement async shader compilation for all shaders.
4 years ago
if(_flags >= Flag::UniformBuffers) {
DebugTools,Shaders,TextureTools: use string view literals everywhere. Mainly important for Shader::addSource() to prevent it from creating a needless copy, but doesn't hurt to do the same also for uniformLocation(), bindAttributeLocation() etc. -- it'll avoid a runtime strlen() in that case at least.
3 years ago
if(_drawCount > 1) _drawOffsetUniform = uniformLocation("drawOffset"_s);
Shaders: add UBO support to all shaders.
5 years ago
} else
#endif
{
DebugTools,Shaders,TextureTools: use string view literals everywhere. Mainly important for Shader::addSource() to prevent it from creating a needless copy, but doesn't hurt to do the same also for uniformLocation(), bindAttributeLocation() etc. -- it'll avoid a runtime strlen() in that case at least.
3 years ago
_transformationProjectionMatrixUniform = uniformLocation("transformationProjectionMatrix"_s);
Shaders: implement async shader compilation for all shaders.
4 years ago
if(_flags & Flag::TextureTransformation)
DebugTools,Shaders,TextureTools: use string view literals everywhere. Mainly important for Shader::addSource() to prevent it from creating a needless copy, but doesn't hurt to do the same also for uniformLocation(), bindAttributeLocation() etc. -- it'll avoid a runtime strlen() in that case at least.
3 years ago
_textureMatrixUniform = uniformLocation("textureMatrix"_s);
_backgroundColorUniform = uniformLocation("backgroundColor"_s);
_colorUniform = uniformLocation("color"_s);
Shaders: add UBO support to all shaders.
5 years ago
}
Shaders: basic text shader.
14 years ago
}
#ifndef MAGNUM_TARGET_GLES
Shaders: minor cleanup. * No need to repeat the type for all variables, unnecessary redundancy. * Reducing the amount of redundant local variables and if they stay making their definitions more localized to where they get used. * All uniform setters used the "initial value is" phrase instead of "default is", this one didn't.
3 years ago
if(!context.isExtensionSupported<GL::Extensions::ARB::shading_language_420pack>(state._version))
Shaders: use explicit texture location and binding on ES3.1+. No reason not to, reduces the amount of unnecessary driver calls quite significantly.
3 years ago
#elif !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL)
if(state._version < GL::Version::GLES310)
Shaders: basic text shader.
14 years ago
#endif
Shaders: fix port of *Vector shaders to old GLSL. Texture layer binding was never set and there were various GLSL compilation errors.
13 years ago
{
DebugTools,Shaders,TextureTools: use string view literals everywhere. Mainly important for Shader::addSource() to prevent it from creating a needless copy, but doesn't hurt to do the same also for uniformLocation(), bindAttributeLocation() etc. -- it'll avoid a runtime strlen() in that case at least.
3 years ago
setUniform(uniformLocation("vectorTexture"_s), TextureUnit);
Shaders: add UBO support to all shaders.
5 years ago
#ifndef MAGNUM_TARGET_GLES2
Shaders: implement async shader compilation for all shaders.
4 years ago
if(_flags >= Flag::UniformBuffers) {
DebugTools,Shaders,TextureTools: use string view literals everywhere. Mainly important for Shader::addSource() to prevent it from creating a needless copy, but doesn't hurt to do the same also for uniformLocation(), bindAttributeLocation() etc. -- it'll avoid a runtime strlen() in that case at least.
3 years ago
setUniformBlockBinding(uniformBlockIndex("TransformationProjection"_s), TransformationProjectionBufferBinding);
setUniformBlockBinding(uniformBlockIndex("Draw"_s), DrawBufferBinding);
Shaders: implement async shader compilation for all shaders.
4 years ago
if(_flags & Flag::TextureTransformation)
DebugTools,Shaders,TextureTools: use string view literals everywhere. Mainly important for Shader::addSource() to prevent it from creating a needless copy, but doesn't hurt to do the same also for uniformLocation(), bindAttributeLocation() etc. -- it'll avoid a runtime strlen() in that case at least.
3 years ago
setUniformBlockBinding(uniformBlockIndex("TextureTransformation"_s), TextureTransformationBufferBinding);
setUniformBlockBinding(uniformBlockIndex("Material"_s), MaterialBufferBinding);
Shaders: add UBO support to all shaders.
5 years ago
}
#endif
Shaders: fix port of *Vector shaders to old GLSL. Texture layer binding was never set and there were various GLSL compilation errors.
13 years ago
}
Shaders: define reasonable uniform defaults for all shaders. Plus a bit of cleanup / fixing broken English.
8 years ago
/* Set defaults in OpenGL ES (for desktop they are set in shader code itself) */
#ifdef MAGNUM_TARGET_GLES
Shaders: add UBO support to all shaders.
5 years ago
#ifndef MAGNUM_TARGET_GLES2
Shaders: implement async shader compilation for all shaders.
4 years ago
if(_flags >= Flag::UniformBuffers) {
Shaders: add UBO support to all shaders.
5 years ago
/* Draw offset is zero by default */
} else
#endif
{
setTransformationProjectionMatrix(MatrixTypeFor<dimensions, Float>{Math::IdentityInit});
Shaders: implement async shader compilation for all shaders.
4 years ago
if(_flags & Flag::TextureTransformation)
Shaders: add UBO support to all shaders.
5 years ago
setTextureMatrix(Matrix3{Math::IdentityInit});
/* Background color is zero by default */
setColor(Color4{1.0f});
}
Shaders: define reasonable uniform defaults for all shaders. Plus a bit of cleanup / fixing broken English.
8 years ago
#endif
Shaders: basic text shader.
14 years ago
}
Shaders: take constructor arguments via a Configuration instance. Because it was no longer bearable with three UnsignedInt arguments in a row, especially when some of them are only available on a subset of platforms. And it would get even worse with introduction of planned features such as multiview or skinning. Backwards compatibility is in place, as always. To ensure nothing breaks, this commit still has all tests and snippets using the old API.
4 years ago
template<UnsignedInt dimensions> VectorGL<dimensions>::VectorGL(const Configuration& configuration): VectorGL{compile(configuration)} {}
Shaders: implement async shader compilation for all shaders.
4 years ago
Shaders: take constructor arguments via a Configuration instance. Because it was no longer bearable with three UnsignedInt arguments in a row, especially when some of them are only available on a subset of platforms. And it would get even worse with introduction of planned features such as multiview or skinning. Backwards compatibility is in place, as always. To ensure nothing breaks, this commit still has all tests and snippets using the old API.
4 years ago
#ifdef MAGNUM_BUILD_DEPRECATED
template<UnsignedInt dimensions> VectorGL<dimensions>::VectorGL(const Flags flags): VectorGL{compile(Configuration{}
.setFlags(flags))} {}
Shaders: implement async shader compilation for all shaders.
4 years ago
Shaders: take constructor arguments via a Configuration instance. Because it was no longer bearable with three UnsignedInt arguments in a row, especially when some of them are only available on a subset of platforms. And it would get even worse with introduction of planned features such as multiview or skinning. Backwards compatibility is in place, as always. To ensure nothing breaks, this commit still has all tests and snippets using the old API.
4 years ago
#ifndef MAGNUM_TARGET_GLES2
template<UnsignedInt dimensions> VectorGL<dimensions>::VectorGL(const Flags flags, const UnsignedInt materialCount, const UnsignedInt drawCount): VectorGL{compile(Configuration{}
.setFlags(flags)
.setMaterialCount(materialCount)
.setDrawCount(drawCount))} {}
#endif
Shaders: add UBO support to all shaders.
5 years ago
#endif
Shaders: implement async shader compilation for all shaders.
4 years ago
template<UnsignedInt dimensions> VectorGL<dimensions>::VectorGL(NoInitT) {}
Shaders: suffix all existing shaders with GL. To make room for Vulkan shaders. Also renaming the headers, of course everything is still aliased to the old names (and marked as deprecated).
5 years ago
template<UnsignedInt dimensions> VectorGL<dimensions>& VectorGL<dimensions>::setTransformationProjectionMatrix(const MatrixTypeFor<dimensions, Float>& matrix) {
Shaders: add UBO support to all shaders.
5 years ago
#ifndef MAGNUM_TARGET_GLES2
CORRADE_ASSERT(!(_flags >= Flag::UniformBuffers),
"Shaders::VectorGL::setTransformationProjectionMatrix(): the shader was created with uniform buffers enabled", *this);
#endif
Shaders: remove the AbstractVector base. 167 additions, 341 deletions. I think that speaks for itself about benefits of this base class.
5 years ago
setUniform(_transformationProjectionMatrixUniform, matrix);
Shaders: de-inline uniform setters. Reduces includes in the header quite a lot, yay.
7 years ago
return *this;
}
Shaders: suffix all existing shaders with GL. To make room for Vulkan shaders. Also renaming the headers, of course everything is still aliased to the old names (and marked as deprecated).
5 years ago
template<UnsignedInt dimensions> VectorGL<dimensions>& VectorGL<dimensions>::setTextureMatrix(const Matrix3& matrix) {
Shaders: add UBO support to all shaders.
5 years ago
#ifndef MAGNUM_TARGET_GLES2
CORRADE_ASSERT(!(_flags >= Flag::UniformBuffers),
"Shaders::VectorGL::setTextureMatrix(): the shader was created with uniform buffers enabled", *this);
#endif
Shaders: implement texture coordinate transformation for all shaders. Except MeshVisualizer and VertexColor, which don't have any texturing, so there it's not needed. In most cases the tests are reusing existing ground truth files and only modifying transformations / flipping images.
6 years ago
CORRADE_ASSERT(_flags & Flag::TextureTransformation,
Shaders: suffix all existing shaders with GL. To make room for Vulkan shaders. Also renaming the headers, of course everything is still aliased to the old names (and marked as deprecated).
5 years ago
"Shaders::VectorGL::setTextureMatrix(): the shader was not created with texture transformation enabled", *this);
Shaders: remove the AbstractVector base. 167 additions, 341 deletions. I think that speaks for itself about benefits of this base class.
5 years ago
setUniform(_textureMatrixUniform, matrix);
Shaders: implement texture coordinate transformation for all shaders. Except MeshVisualizer and VertexColor, which don't have any texturing, so there it's not needed. In most cases the tests are reusing existing ground truth files and only modifying transformations / flipping images.
6 years ago
return *this;
}
Shaders: suffix all existing shaders with GL. To make room for Vulkan shaders. Also renaming the headers, of course everything is still aliased to the old names (and marked as deprecated).
5 years ago
template<UnsignedInt dimensions> VectorGL<dimensions>& VectorGL<dimensions>::setBackgroundColor(const Color4& color) {
Shaders: add UBO support to all shaders.
5 years ago
#ifndef MAGNUM_TARGET_GLES2
CORRADE_ASSERT(!(_flags >= Flag::UniformBuffers),
"Shaders::VectorGL::setBackgroundColor(): the shader was created with uniform buffers enabled", *this);
#endif
Shaders: remove the AbstractVector base. 167 additions, 341 deletions. I think that speaks for itself about benefits of this base class.
5 years ago
setUniform(_backgroundColorUniform, color);
Shaders: de-inline uniform setters. Reduces includes in the header quite a lot, yay.
7 years ago
return *this;
}
Shaders: suffix all existing shaders with GL. To make room for Vulkan shaders. Also renaming the headers, of course everything is still aliased to the old names (and marked as deprecated).
5 years ago
template<UnsignedInt dimensions> VectorGL<dimensions>& VectorGL<dimensions>::setColor(const Color4& color) {
Shaders: add UBO support to all shaders.
5 years ago
#ifndef MAGNUM_TARGET_GLES2
CORRADE_ASSERT(!(_flags >= Flag::UniformBuffers),
"Shaders::VectorGL::setColor(): the shader was created with uniform buffers enabled", *this);
#endif
Shaders: remove the AbstractVector base. 167 additions, 341 deletions. I think that speaks for itself about benefits of this base class.
5 years ago
setUniform(_colorUniform, color);
return *this;
}
Shaders: add UBO support to all shaders.
5 years ago
#ifndef MAGNUM_TARGET_GLES2
template<UnsignedInt dimensions> VectorGL<dimensions>& VectorGL<dimensions>::setDrawOffset(const UnsignedInt offset) {
CORRADE_ASSERT(_flags >= Flag::UniformBuffers,
"Shaders::VectorGL::setDrawOffset(): the shader was not created with uniform buffers enabled", *this);
CORRADE_ASSERT(offset < _drawCount,
"Shaders::VectorGL::setDrawOffset(): draw offset" << offset << "is out of bounds for" << _drawCount << "draws", *this);
Shaders: assume drawOffset is 0 if DRAW_COUNT is 1. This is always true in the single-draw case, since setDrawOffset() asserts on this. In the multi-draw case this optimization doesn't make sense, because it doesn't make sense to create a multidraw shader with just one draw. On an Intel 630 GPU this resulted in single-draw single-material Phong to go from 550 ms to 440, which is roughly a 20% improvement. For the simpler shaders the difference is even higher. The multidraw numbers stayed the same as before, obviously.
5 years ago
if(_drawCount > 1) setUniform(_drawOffsetUniform, offset);
Shaders: add UBO support to all shaders.
5 years ago
return *this;
}
template<UnsignedInt dimensions> VectorGL<dimensions>& VectorGL<dimensions>::bindTransformationProjectionBuffer(GL::Buffer& buffer) {
CORRADE_ASSERT(_flags >= Flag::UniformBuffers,
"Shaders::VectorGL::bindTransformationProjectionBuffer(): the shader was not created with uniform buffers enabled", *this);
buffer.bind(GL::Buffer::Target::Uniform, TransformationProjectionBufferBinding);
return *this;
}
template<UnsignedInt dimensions> VectorGL<dimensions>& VectorGL<dimensions>::bindTransformationProjectionBuffer(GL::Buffer& buffer, const GLintptr offset, const GLsizeiptr size) {
CORRADE_ASSERT(_flags >= Flag::UniformBuffers,
"Shaders::VectorGL::bindTransformationProjectionBuffer(): the shader was not created with uniform buffers enabled", *this);
buffer.bind(GL::Buffer::Target::Uniform, TransformationProjectionBufferBinding, offset, size);
return *this;
}
template<UnsignedInt dimensions> VectorGL<dimensions>& VectorGL<dimensions>::bindDrawBuffer(GL::Buffer& buffer) {
CORRADE_ASSERT(_flags >= Flag::UniformBuffers,
"Shaders::VectorGL::bindDrawBuffer(): the shader was not created with uniform buffers enabled", *this);
buffer.bind(GL::Buffer::Target::Uniform, DrawBufferBinding);
return *this;
}
template<UnsignedInt dimensions> VectorGL<dimensions>& VectorGL<dimensions>::bindDrawBuffer(GL::Buffer& buffer, const GLintptr offset, const GLsizeiptr size) {
CORRADE_ASSERT(_flags >= Flag::UniformBuffers,
"Shaders::VectorGL::bindDrawBuffer(): the shader was not created with uniform buffers enabled", *this);
buffer.bind(GL::Buffer::Target::Uniform, DrawBufferBinding, offset, size);
return *this;
}
template<UnsignedInt dimensions> VectorGL<dimensions>& VectorGL<dimensions>::bindTextureTransformationBuffer(GL::Buffer& buffer) {
CORRADE_ASSERT(_flags >= Flag::UniformBuffers,
"Shaders::VectorGL::bindTextureTransformationBuffer(): the shader was not created with uniform buffers enabled", *this);
CORRADE_ASSERT(_flags & Flag::TextureTransformation,
"Shaders::VectorGL::bindTextureTransformationBuffer(): the shader was not created with texture transformation enabled", *this);
buffer.bind(GL::Buffer::Target::Uniform, TextureTransformationBufferBinding);
return *this;
}
template<UnsignedInt dimensions> VectorGL<dimensions>& VectorGL<dimensions>::bindTextureTransformationBuffer(GL::Buffer& buffer, const GLintptr offset, const GLsizeiptr size) {
CORRADE_ASSERT(_flags >= Flag::UniformBuffers,
"Shaders::VectorGL::bindTextureTransformationBuffer(): the shader was not created with uniform buffers enabled", *this);
CORRADE_ASSERT(_flags & Flag::TextureTransformation,
"Shaders::VectorGL::bindTextureTransformationBuffer(): the shader was not created with texture transformation enabled", *this);
buffer.bind(GL::Buffer::Target::Uniform, TextureTransformationBufferBinding, offset, size);
return *this;
}
Shaders: supply Vector material information in a separate UBO as well. So it's all having the same workflow. This one results in even more saved UBO slots per-draw than in the case of Flat, and the slowdown on Intel is as bad as expected.
5 years ago
template<UnsignedInt dimensions> VectorGL<dimensions>& VectorGL<dimensions>::bindMaterialBuffer(GL::Buffer& buffer) {
CORRADE_ASSERT(_flags >= Flag::UniformBuffers,
"Shaders::VectorGL::bindMaterialBuffer(): the shader was not created with uniform buffers enabled", *this);
buffer.bind(GL::Buffer::Target::Uniform, MaterialBufferBinding);
return *this;
}
template<UnsignedInt dimensions> VectorGL<dimensions>& VectorGL<dimensions>::bindMaterialBuffer(GL::Buffer& buffer, const GLintptr offset, const GLsizeiptr size) {
CORRADE_ASSERT(_flags >= Flag::UniformBuffers,
"Shaders::VectorGL::bindMaterialBuffer(): the shader was not created with uniform buffers enabled", *this);
buffer.bind(GL::Buffer::Target::Uniform, MaterialBufferBinding, offset, size);
return *this;
}
Shaders: add UBO support to all shaders.
5 years ago
#endif
Shaders: remove the AbstractVector base. 167 additions, 341 deletions. I think that speaks for itself about benefits of this base class.
5 years ago
template<UnsignedInt dimensions> VectorGL<dimensions>& VectorGL<dimensions>::bindVectorTexture(GL::Texture2D& texture) {
texture.bind(TextureUnit);
Shaders: de-inline uniform setters. Reduces includes in the header quite a lot, yay.
7 years ago
return *this;
}
Shaders: wait, how did the linker work for the whole decade?! No issue on GCC, only Clang and MSVC started failing once I renamed the shaders. These four are the only that don't have the export macro attached AND YET it somehow worked without any problem until now.
5 years ago
template class MAGNUM_SHADERS_EXPORT VectorGL<2>;
template class MAGNUM_SHADERS_EXPORT VectorGL<3>;
Shaders: basic text shader.
14 years ago
Shaders: implement texture coordinate transformation for all shaders. Except MeshVisualizer and VertexColor, which don't have any texturing, so there it's not needed. In most cases the tests are reusing existing ground truth files and only modifying transformations / flipping images.
6 years ago
namespace Implementation {
Shaders: suffix all existing shaders with GL. To make room for Vulkan shaders. Also renaming the headers, of course everything is still aliased to the old names (and marked as deprecated).
5 years ago
Debug& operator<<(Debug& debug, const VectorGLFlag value) {
debug << "Shaders::VectorGL::Flag" << Debug::nospace;
Shaders: implement texture coordinate transformation for all shaders. Except MeshVisualizer and VertexColor, which don't have any texturing, so there it's not needed. In most cases the tests are reusing existing ground truth files and only modifying transformations / flipping images.
6 years ago
switch(value) {
/* LCOV_EXCL_START */
Shaders: suffix all existing shaders with GL. To make room for Vulkan shaders. Also renaming the headers, of course everything is still aliased to the old names (and marked as deprecated).
5 years ago
#define _c(v) case VectorGLFlag::v: return debug << "::" #v;
Shaders: implement texture coordinate transformation for all shaders. Except MeshVisualizer and VertexColor, which don't have any texturing, so there it's not needed. In most cases the tests are reusing existing ground truth files and only modifying transformations / flipping images.
6 years ago
_c(TextureTransformation)
Shaders: add UBO support to all shaders.
5 years ago
#ifndef MAGNUM_TARGET_GLES2
_c(UniformBuffers)
Shaders: multidraw support in all builtin shaders.
5 years ago
_c(MultiDraw)
Shaders: add UBO support to all shaders.
5 years ago
#endif
Shaders: implement texture coordinate transformation for all shaders. Except MeshVisualizer and VertexColor, which don't have any texturing, so there it's not needed. In most cases the tests are reusing existing ground truth files and only modifying transformations / flipping images.
6 years ago
#undef _c
/* LCOV_EXCL_STOP */
}
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
}
Shaders: suffix all existing shaders with GL. To make room for Vulkan shaders. Also renaming the headers, of course everything is still aliased to the old names (and marked as deprecated).
5 years ago
Debug& operator<<(Debug& debug, const VectorGLFlags value) {
return Containers::enumSetDebugOutput(debug, value, "Shaders::VectorGL::Flags{}", {
Shaders: add UBO support to all shaders.
5 years ago
VectorGLFlag::TextureTransformation,
#ifndef MAGNUM_TARGET_GLES2
Shaders: multidraw support in all builtin shaders.
5 years ago
VectorGLFlag::MultiDraw, /* Superset of UniformBuffers */
Shaders: add UBO support to all shaders.
5 years ago
VectorGLFlag::UniformBuffers
#endif
});
Shaders: implement texture coordinate transformation for all shaders. Except MeshVisualizer and VertexColor, which don't have any texturing, so there it's not needed. In most cases the tests are reusing existing ground truth files and only modifying transformations / flipping images.
6 years ago
}
}
Shaders: basic text shader.
14 years ago
}}