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.
11650 Commits
21 Branches
19 Tags
78 MiB
Tree: 6dbd48559b
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '6dbd48559b'
${ noResults }
magnum/src/Magnum/GL/Implementation/ShaderState.cpp

92 lines
4.5 KiB
Raw Normal View History Unescape

Work around issue with Unicode shaders with threaded Emscripten.
9 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,
Update copyright year.
7 months ago
2020, 2021, 2022, 2023, 2024, 2025, 2026
It's October already?!
2 years ago
Vladimír Vondruš <mosra@centrum.cz>
Doc++, updated changelog.
4 years ago
Copyright © 2022 Vladislav Oleshko <vladislav.oleshko@gmail.com>
Work around issue with Unicode shaders with threaded Emscripten.
9 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.
*/
#include "ShaderState.h"
GL: advertise the "intel-windows-chatty-shader-compiler" workaround. This was done silently until now and I think such platform-specific code should be always exposed as a disableable workaround. Moreover, I need a similar thing for ANGLE, so this comes handy.
6 years ago
/* Needed only for Emscripten+pthread- / Windows+Intel-specific workarounds,
but I won't bother crafting the preprocessor logic for this. */
GL: rework Context to not use any STL containers. We're going to eventually include this class in all Application classes (need that in order to inherit a to-be-created Configuration class) and the <string> and <vector> would be just too much. This change caused magnum-gl-info.wasm (WebGL 2 build) to go down from 247 to 245 kB. Not much, but that's I guess because there's still a lot other vectors of strings elsewhere. There's a lot more places to clean up, will do those in separate commits. This change is the most atomic I could do, and it introduces a breaking change to all APIs that returned a std::vector or a std::string. Fortunately (or as I hope) those weren't used that much, so it shouldn't cause build breakages for that many people. Quite a lot of the optimization ideas is borrowed from the new Vk library -- such as "interning" the driver workaround strings to avoid allocating their copies.
6 years ago
#include <Corrade/Containers/StringView.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.
9 years ago
#include "Magnum/GL/Context.h"
GL: advertise the "intel-windows-chatty-shader-compiler" workaround. This was done silently until now and I think such platform-specific code should be always exposed as a disableable workaround. Moreover, I need a similar thing for ANGLE, so this comes handy.
6 years ago
#include "Magnum/GL/Shader.h"
GL: implement APIs for async shader compilation & linking.
4 years ago
#include "Magnum/GL/Extensions.h"
Work around issue with Unicode shaders with threaded Emscripten.
9 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.
9 years ago
namespace Magnum { namespace GL { namespace Implementation {
Work around issue with Unicode shaders with threaded Emscripten.
9 years ago
GL: use StringView literals for all workaround names. These are in most cases the only strings that are used, and I don't think having to call std::strlen() for each of them is a good idea if we don't need to.
6 years ago
using namespace Containers::Literals;
GL: implement APIs for async shader compilation & linking.
4 years ago
ShaderState::ShaderState(Context& context, Containers::StaticArrayView<Implementation::ExtensionCount, const char*> extensions):
Work around issue with Unicode shaders with threaded Emscripten.
9 years ago
maxVertexOutputComponents{}, maxFragmentInputComponents{},
#if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL)
maxTessellationControlInputComponents{}, maxTessellationControlOutputComponents{}, maxTessellationControlTotalOutputComponents{}, maxTessellationEvaluationInputComponents{}, maxTessellationEvaluationOutputComponents{}, maxGeometryInputComponents{}, maxGeometryOutputComponents{}, maxGeometryTotalOutputComponents{}, maxAtomicCounterBuffers{}, maxCombinedAtomicCounterBuffers{}, maxAtomicCounters{}, maxCombinedAtomicCounters{}, maxImageUniforms{}, maxCombinedImageUniforms{}, maxShaderStorageBlocks{}, maxCombinedShaderStorageBlocks{},
#endif
maxTextureImageUnits{}, maxTextureImageUnitsCombined{},
#ifndef MAGNUM_TARGET_GLES2
maxUniformBlocks{}, maxCombinedUniformBlocks{},
#endif
maxUniformComponents{}, maxUniformComponentsCombined{}
#ifndef MAGNUM_TARGET_GLES2
, maxCombinedUniformComponents{}
#endif
{
#if defined(CORRADE_TARGET_EMSCRIPTEN) && defined(__EMSCRIPTEN_PTHREADS__)
GL: use StringView literals for all workaround names. These are in most cases the only strings that are used, and I don't think having to call std::strlen() for each of them is a good idea if we don't need to.
6 years ago
if(!context.isDriverWorkaroundDisabled("emscripten-pthreads-broken-unicode-shader-sources"_s)) {
Work around issue with Unicode shaders with threaded Emscripten.
9 years ago
addSourceImplementation = &Shader::addSourceImplementationEmscriptenPthread;
} else
#endif
{
addSourceImplementation = &Shader::addSourceImplementationDefault;
}
GL: advertise the "intel-windows-chatty-shader-compiler" workaround. This was done silently until now and I think such platform-specific code should be always exposed as a disableable workaround. Moreover, I need a similar thing for ANGLE, so this comes handy.
6 years ago
#if defined(CORRADE_TARGET_WINDOWS) && !defined(MAGNUM_TARGET_GLES)
GL: use StringView literals for all workaround names. These are in most cases the only strings that are used, and I don't think having to call std::strlen() for each of them is a good idea if we don't need to.
6 years ago
if((context.detectedDriver() & Context::DetectedDriver::IntelWindows) && !context.isDriverWorkaroundDisabled("intel-windows-chatty-shader-compiler"_s)) {
GL: advertise the "intel-windows-chatty-shader-compiler" workaround. This was done silently until now and I think such platform-specific code should be always exposed as a disableable workaround. Moreover, I need a similar thing for ANGLE, so this comes handy.
6 years ago
cleanLogImplementation = &Shader::cleanLogImplementationIntelWindows;
} else
Work around issue with Unicode shaders with threaded Emscripten.
9 years ago
#endif
GL: advertise the "intel-windows-chatty-shader-compiler" workaround. This was done silently until now and I think such platform-specific code should be always exposed as a disableable workaround. Moreover, I need a similar thing for ANGLE, so this comes handy.
6 years ago
{
cleanLogImplementation = &Shader::cleanLogImplementationNoOp;
}
GL: implement APIs for async shader compilation & linking.
4 years ago
if(context.isExtensionSupported<GL::Extensions::KHR::parallel_shader_compile>()) {
GL: some GLES extensions weren't reported as used during startup. Huh.
4 years ago
extensions[Extensions::KHR::parallel_shader_compile::Index] =
Extensions::KHR::parallel_shader_compile::string();
GL: implement APIs for async shader compilation & linking.
4 years ago
completionStatusImplementation = glGetShaderiv;
} else {
completionStatusImplementation = &Shader::completionStatusImplementationFallback;
}
GL: new "adreno-glsl-version-stuck-at-300" workaround.
3 years ago
#if defined(MAGNUM_TARGET_GLES) && !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL) && !defined(CORRADE_TARGET_APPLE)
if((context.detectedDriver() & Context::DetectedDriver::QualcommAdreno) && !context.isDriverWorkaroundDisabled("adreno-glsl-version-stuck-at-300"_s)) {
workaroundDefinesImplementation = &Shader::workaroundDefinesImplementationAdrenoVersion;
} else {
workaroundDefinesImplementation = &Shader::workaroundDefinesImplementationNoOp;
}
#endif
Work around issue with Unicode shaders with threaded Emscripten.
9 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.
9 years ago
}}}