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

127 lines
6.9 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_Implementation_ShaderProgramState_h
#define Magnum_GL_Implementation_ShaderProgramState_h
Tracking AbstractShaderProgram state. Reduces OpenGL call count when subsequently using the same shader for rendering.
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.
5 years ago
2020, 2021 Vladimír Vondruš <mosra@centrum.cz>
Relicensing to MIT/Expat license, part 2: headers.
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.
Tracking AbstractShaderProgram state. Reduces OpenGL call count when subsequently using the same shader for rendering.
14 years ago
*/
GL: avoid populating and sorting (!!) a vector of strings for exts. Ew. At first I tried to just port a growable Array of StringViews (which would already save quite a lot), but then I realized I have a clear upper bound on the extensions and so can use a "counting sort" without having to deduplicate anything after. After the previous (rather minimal) reduction by the Context cleanup, this reduces the size of magnum-gl-info.wasm from 245 to 237 kB. Quite significant, I'd say!
5 years ago
#include <Corrade/Utility/StlForwardString.h>
Moved global data from shader classes to per-context state.
12 years ago
GL: avoid populating and sorting (!!) a vector of strings for exts. Ew. At first I tried to just port a growable Array of StringViews (which would already save quite a lot), but then I realized I have a clear upper bound on the extensions and so can use a "counting sort" without having to deduplicate anything after. After the previous (rather minimal) reduction by the Context cleanup, this reduces the size of magnum-gl-info.wasm from 245 to 237 kB. Quite significant, I'd say!
5 years ago
#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/GL.h"
#include "Magnum/GL/OpenGL.h"
Added missing ARB_compute_shader limit queries.
10 years ago
#include "Magnum/Math/Vector3.h"
Tracking AbstractShaderProgram state. Reduces OpenGL call count when subsequently using the same shader for rendering.
14 years ago
Added nv-windows-dangling-transform-feedback-varying-names workaround. On Windows NVidia drivers the glTransformFeedbackVaryings() does not make a copy of its char* arguments so it fails at link time when the original char arrays are not in scope anymore. Enabling *synchronous* debug output circumvents this bug. Can be triggered by running TransformFeedbackGLTest with GL_KHR_debug extension disabled.
10 years ago
#ifndef MAGNUM_TARGET_GLES2
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/AbstractShaderProgram.h"
Fix memory corruption on MSVC. I can't believe that you can just forget to include some file and it will SILENTLY PASS and then crashes horribly at runtime because each translation unit thought that given member function pointer had completely different size. THIS IS NOT ACCEPTABLE.
11 years ago
#endif
Split the OpenGL layer out, pt 4: new Magnum::GL namespace. At the moment just the GL library itself w/o the tests, and without backwards compatibility aliases. The following types were left in the root namespace, despite being in the GL/ directory, as they will get moved back soon: * Image, CompressedImage and their dimensional typedefs * ImageView, CompressedImageView and their dimensional typedefs * PixelStorage Not PixelFormat etc., that one will stay in the GL namespace and a completely new PixelFormat enum will be provided in the root namespace.
8 years ago
namespace Magnum { namespace GL { namespace Implementation {
Tracking AbstractShaderProgram state. Reduces OpenGL call count when subsequently using the same shader for rendering.
14 years ago
struct ShaderProgramState {
GL: avoid populating and sorting (!!) a vector of strings for exts. Ew. At first I tried to just port a growable Array of StringViews (which would already save quite a lot), but then I realized I have a clear upper bound on the extensions and so can use a "counting sort" without having to deduplicate anything after. After the previous (rather minimal) reduction by the Context cleanup, this reduces the size of magnum-gl-info.wasm from 245 to 237 kB. Quite significant, I'd say!
5 years ago
explicit ShaderProgramState(Context& context, Containers::StaticArrayView<Implementation::ExtensionCount, const char*> extensions);
Moved global data from shader classes to per-context state.
12 years ago
Ability to reset internal state tracker.
12 years ago
void reset();
Added nv-windows-dangling-transform-feedback-varying-names workaround. On Windows NVidia drivers the glTransformFeedbackVaryings() does not make a copy of its char* arguments so it fails at link time when the original char arrays are not in scope anymore. Enabling *synchronous* debug output circumvents this bug. Can be triggered by running TransformFeedbackGLTest with GL_KHR_debug extension disabled.
10 years ago
#ifndef MAGNUM_TARGET_GLES2
void(AbstractShaderProgram::*transformFeedbackVaryingsImplementation)(Containers::ArrayView<const std::string>, AbstractShaderProgram::TransformFeedbackBufferMode);
#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.
5 years ago
void(*cleanLogImplementation)(std::string&);
Added nv-windows-dangling-transform-feedback-varying-names workaround. On Windows NVidia drivers the glTransformFeedbackVaryings() does not make a copy of its char* arguments so it fails at link time when the original char arrays are not in scope anymore. Enabling *synchronous* debug output circumvents this bug. Can be triggered by running TransformFeedbackGLTest with GL_KHR_debug extension disabled.
10 years ago
Moved global data from shader classes to per-context state.
12 years ago
void(AbstractShaderProgram::*uniform1fvImplementation)(GLint, GLsizei, const GLfloat*);
void(AbstractShaderProgram::*uniform2fvImplementation)(GLint, GLsizei, const Math::Vector<2, GLfloat>*);
void(AbstractShaderProgram::*uniform3fvImplementation)(GLint, GLsizei, const Math::Vector<3, GLfloat>*);
void(AbstractShaderProgram::*uniform4fvImplementation)(GLint, GLsizei, const Math::Vector<4, GLfloat>*);
void(AbstractShaderProgram::*uniform1ivImplementation)(GLint, GLsizei, const GLint*);
void(AbstractShaderProgram::*uniform2ivImplementation)(GLint, GLsizei, const Math::Vector<2, GLint>*);
void(AbstractShaderProgram::*uniform3ivImplementation)(GLint, GLsizei, const Math::Vector<3, GLint>*);
void(AbstractShaderProgram::*uniform4ivImplementation)(GLint, GLsizei, const Math::Vector<4, GLint>*);
#ifndef MAGNUM_TARGET_GLES2
void(AbstractShaderProgram::*uniform1uivImplementation)(GLint, GLsizei, const GLuint*);
void(AbstractShaderProgram::*uniform2uivImplementation)(GLint, GLsizei, const Math::Vector<2, GLuint>*);
void(AbstractShaderProgram::*uniform3uivImplementation)(GLint, GLsizei, const Math::Vector<3, GLuint>*);
void(AbstractShaderProgram::*uniform4uivImplementation)(GLint, GLsizei, const Math::Vector<4, GLuint>*);
#endif
#ifndef MAGNUM_TARGET_GLES
void(AbstractShaderProgram::*uniform1dvImplementation)(GLint, GLsizei, const GLdouble*);
void(AbstractShaderProgram::*uniform2dvImplementation)(GLint, GLsizei, const Math::Vector<2, GLdouble>*);
void(AbstractShaderProgram::*uniform3dvImplementation)(GLint, GLsizei, const Math::Vector<3, GLdouble>*);
void(AbstractShaderProgram::*uniform4dvImplementation)(GLint, GLsizei, const Math::Vector<4, GLdouble>*);
#endif
void(AbstractShaderProgram::*uniformMatrix2fvImplementation)(GLint, GLsizei, const Math::RectangularMatrix<2, 2, GLfloat>*);
void(AbstractShaderProgram::*uniformMatrix3fvImplementation)(GLint, GLsizei, const Math::RectangularMatrix<3, 3, GLfloat>*);
void(AbstractShaderProgram::*uniformMatrix4fvImplementation)(GLint, GLsizei, const Math::RectangularMatrix<4, 4, GLfloat>*);
#ifndef MAGNUM_TARGET_GLES2
void(AbstractShaderProgram::*uniformMatrix2x3fvImplementation)(GLint, GLsizei, const Math::RectangularMatrix<2, 3, GLfloat>*);
void(AbstractShaderProgram::*uniformMatrix3x2fvImplementation)(GLint, GLsizei, const Math::RectangularMatrix<3, 2, GLfloat>*);
void(AbstractShaderProgram::*uniformMatrix2x4fvImplementation)(GLint, GLsizei, const Math::RectangularMatrix<2, 4, GLfloat>*);
void(AbstractShaderProgram::*uniformMatrix4x2fvImplementation)(GLint, GLsizei, const Math::RectangularMatrix<4, 2, GLfloat>*);
void(AbstractShaderProgram::*uniformMatrix3x4fvImplementation)(GLint, GLsizei, const Math::RectangularMatrix<3, 4, GLfloat>*);
void(AbstractShaderProgram::*uniformMatrix4x3fvImplementation)(GLint, GLsizei, const Math::RectangularMatrix<4, 3, GLfloat>*);
#endif
#ifndef MAGNUM_TARGET_GLES
void(AbstractShaderProgram::*uniformMatrix2dvImplementation)(GLint, GLsizei, const Math::RectangularMatrix<2, 2, GLdouble>*);
void(AbstractShaderProgram::*uniformMatrix3dvImplementation)(GLint, GLsizei, const Math::RectangularMatrix<3, 3, GLdouble>*);
void(AbstractShaderProgram::*uniformMatrix4dvImplementation)(GLint, GLsizei, const Math::RectangularMatrix<4, 4, GLdouble>*);
void(AbstractShaderProgram::*uniformMatrix2x3dvImplementation)(GLint, GLsizei, const Math::RectangularMatrix<2, 3, GLdouble>*);
void(AbstractShaderProgram::*uniformMatrix3x2dvImplementation)(GLint, GLsizei, const Math::RectangularMatrix<3, 2, GLdouble>*);
void(AbstractShaderProgram::*uniformMatrix2x4dvImplementation)(GLint, GLsizei, const Math::RectangularMatrix<2, 4, GLdouble>*);
void(AbstractShaderProgram::*uniformMatrix4x2dvImplementation)(GLint, GLsizei, const Math::RectangularMatrix<4, 2, GLdouble>*);
void(AbstractShaderProgram::*uniformMatrix3x4dvImplementation)(GLint, GLsizei, const Math::RectangularMatrix<3, 4, GLdouble>*);
void(AbstractShaderProgram::*uniformMatrix4x3dvImplementation)(GLint, GLsizei, const Math::RectangularMatrix<4, 3, GLdouble>*);
#endif
Tracking AbstractShaderProgram state. Reduces OpenGL call count when subsequently using the same shader for rendering.
14 years ago
/* Currently used program */
GLuint current;
Shader-related limit queries. Renamed AbstractShaderProgram::maxSupportedVertexAttributeCount() to maxVertexAttributes(), the old function is now an alias to retain source compatibility, will be removed in future release. Also printing the values in magnum-info.
13 years ago
GLint maxVertexAttributes;
Enabled new shader functionality in ES 3.1.
12 years ago
#ifndef MAGNUM_TARGET_GLES2
First-class WebGL support, part 6: reduced shader functionality.
11 years ago
#ifndef MAGNUM_TARGET_WEBGL
GL: add a GL::AbstractShaderProgram::maxGeometryOutputVertices() query.
6 years ago
GLint maxGeometryOutputVertices,
maxAtomicCounterBufferSize,
Shader-related limit queries. Renamed AbstractShaderProgram::maxSupportedVertexAttributeCount() to maxVertexAttributes(), the old function is now an alias to retain source compatibility, will be removed in future release. Also printing the values in magnum-info.
13 years ago
maxComputeSharedMemorySize,
maxComputeWorkGroupInvocations,
maxImageUnits,
maxCombinedShaderOutputResources,
First-class WebGL support, part 6: reduced shader functionality.
11 years ago
maxUniformLocations;
Added missing ARB_compute_shader limit queries.
10 years ago
Vector3i maxComputeWorkGroupCount,
maxComputeWorkGroupSize;
First-class WebGL support, part 6: reduced shader functionality.
11 years ago
#endif
GLint minTexelOffset,
Enabled new shader functionality in ES 3.1.
12 years ago
maxTexelOffset,
maxUniformBlockSize;
First-class WebGL support, part 6: reduced shader functionality.
11 years ago
#ifndef MAGNUM_TARGET_WEBGL
Shader-related limit queries. Renamed AbstractShaderProgram::maxSupportedVertexAttributeCount() to maxVertexAttributes(), the old function is now an alias to retain source compatibility, will be removed in future release. Also printing the values in magnum-info.
13 years ago
GLint64 maxShaderStorageBlockSize;
#endif
First-class WebGL support, part 6: reduced shader functionality.
11 years ago
#endif
Shader-related limit queries. Renamed AbstractShaderProgram::maxSupportedVertexAttributeCount() to maxVertexAttributes(), the old function is now an alias to retain source compatibility, will be removed in future release. Also printing the values in magnum-info.
13 years ago
Enabled new shader functionality in ES 3.1.
12 years ago
#ifndef MAGNUM_TARGET_GLES
GLint maxImageSamples;
Shader-related limit queries. Renamed AbstractShaderProgram::maxSupportedVertexAttributeCount() to maxVertexAttributes(), the old function is now an alias to retain source compatibility, will be removed in future release. Also printing the values in magnum-info.
13 years ago
#endif
Tracking AbstractShaderProgram state. Reduces OpenGL call count when subsequently using the same shader for rendering.
14 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
}}}
Tracking AbstractShaderProgram state. Reduces OpenGL call count when subsequently using the same shader for rendering.
14 years ago
#endif