Browse Source

Import GL shader resources on static builds unconditionally.

It's faster that way because it doesn't involve a linear lookup, if the
resource is already imported it's a constant-time check and it becomes a
no-op.
pull/680/head
Vladimír Vondruš 8 months ago
parent
commit
507e8845d3
  1. 4
      src/Magnum/DebugTools/TextureImage.cpp
  2. 4
      src/Magnum/Shaders/DistanceFieldVectorGL.cpp
  3. 4
      src/Magnum/Shaders/FlatGL.cpp
  4. 4
      src/Magnum/Shaders/LineGL.cpp
  5. 4
      src/Magnum/Shaders/MeshVisualizerGL.cpp
  6. 4
      src/Magnum/Shaders/PhongGL.cpp
  7. 4
      src/Magnum/Shaders/VectorGL.cpp
  8. 4
      src/Magnum/Shaders/VertexColorGL.cpp
  9. 4
      src/Magnum/TextureTools/DistanceFieldGL.cpp

4
src/Magnum/DebugTools/TextureImage.cpp

@ -81,9 +81,7 @@ class FloatReinterpretShader: public GL::AbstractShaderProgram {
FloatReinterpretShader::FloatReinterpretShader() { FloatReinterpretShader::FloatReinterpretShader() {
#ifdef MAGNUM_BUILD_STATIC #ifdef MAGNUM_BUILD_STATIC
/* Import resources on static build, if not already */ importDebugToolsResources();
if(!Utility::Resource::hasGroup("MagnumDebugTools"_s))
importDebugToolsResources();
#endif #endif
Utility::Resource rs{"MagnumDebugTools"}; Utility::Resource rs{"MagnumDebugTools"};

4
src/Magnum/Shaders/DistanceFieldVectorGL.cpp

@ -117,9 +117,7 @@ template<UnsignedInt dimensions> typename DistanceFieldVectorGL<dimensions>::Com
#endif #endif
#ifdef MAGNUM_BUILD_STATIC #ifdef MAGNUM_BUILD_STATIC
/* Import resources on static build, if not already */ importShaderResources();
if(!Utility::Resource::hasGroup("MagnumShadersGL"_s))
importShaderResources();
#endif #endif
Utility::Resource rs("MagnumShadersGL"_s); Utility::Resource rs("MagnumShadersGL"_s);

4
src/Magnum/Shaders/FlatGL.cpp

@ -155,9 +155,7 @@ template<UnsignedInt dimensions> typename FlatGL<dimensions>::CompileState FlatG
#endif #endif
#ifdef MAGNUM_BUILD_STATIC #ifdef MAGNUM_BUILD_STATIC
/* Import resources on static build, if not already */ importShaderResources();
if(!Utility::Resource::hasGroup("MagnumShadersGL"_s))
importShaderResources();
#endif #endif
Utility::Resource rs("MagnumShadersGL"_s); Utility::Resource rs("MagnumShadersGL"_s);

4
src/Magnum/Shaders/LineGL.cpp

@ -108,9 +108,7 @@ template<UnsignedInt dimensions> typename LineGL<dimensions>::CompileState LineG
} }
#ifdef MAGNUM_BUILD_STATIC #ifdef MAGNUM_BUILD_STATIC
/* Import resources on static build, if not already */ importShaderResources();
if(!Utility::Resource::hasGroup("MagnumShadersGL"_s))
importShaderResources();
#endif #endif
Utility::Resource rs{"MagnumShadersGL"_s}; Utility::Resource rs{"MagnumShadersGL"_s};

4
src/Magnum/Shaders/MeshVisualizerGL.cpp

@ -160,9 +160,7 @@ void MeshVisualizerGLBase::assertExtensions(const FlagsBase flags) {
#endif #endif
#ifdef MAGNUM_BUILD_STATIC #ifdef MAGNUM_BUILD_STATIC
/* Import resources on static build, if not already */ importShaderResources();
if(!Utility::Resource::hasGroup("MagnumShadersGL"_s))
importShaderResources();
#endif #endif
} }

4
src/Magnum/Shaders/PhongGL.cpp

@ -173,9 +173,7 @@ PhongGL::CompileState PhongGL::compile(const Configuration& configuration) {
#endif #endif
#ifdef MAGNUM_BUILD_STATIC #ifdef MAGNUM_BUILD_STATIC
/* Import resources on static build, if not already */ importShaderResources();
if(!Utility::Resource::hasGroup("MagnumShadersGL"_s))
importShaderResources();
#endif #endif
Utility::Resource rs("MagnumShadersGL"_s); Utility::Resource rs("MagnumShadersGL"_s);

4
src/Magnum/Shaders/VectorGL.cpp

@ -117,9 +117,7 @@ template<UnsignedInt dimensions> typename VectorGL<dimensions>::CompileState Vec
#endif #endif
#ifdef MAGNUM_BUILD_STATIC #ifdef MAGNUM_BUILD_STATIC
/* Import resources on static build, if not already */ importShaderResources();
if(!Utility::Resource::hasGroup("MagnumShadersGL"_s))
importShaderResources();
#endif #endif
Utility::Resource rs("MagnumShadersGL"_s); Utility::Resource rs("MagnumShadersGL"_s);

4
src/Magnum/Shaders/VertexColorGL.cpp

@ -104,9 +104,7 @@ template<UnsignedInt dimensions> typename VertexColorGL<dimensions>::CompileStat
#endif #endif
#ifdef MAGNUM_BUILD_STATIC #ifdef MAGNUM_BUILD_STATIC
/* Import resources on static build, if not already */ importShaderResources();
if(!Utility::Resource::hasGroup("MagnumShadersGL"_s))
importShaderResources();
#endif #endif
Utility::Resource rs("MagnumShadersGL"_s); Utility::Resource rs("MagnumShadersGL"_s);

4
src/Magnum/TextureTools/DistanceFieldGL.cpp

@ -82,9 +82,7 @@ class DistanceFieldShader: public GL::AbstractShaderProgram {
DistanceFieldShader::DistanceFieldShader(const UnsignedInt radius) { DistanceFieldShader::DistanceFieldShader(const UnsignedInt radius) {
#ifdef MAGNUM_BUILD_STATIC #ifdef MAGNUM_BUILD_STATIC
/* Import resources on static build, if not already */ importTextureToolResources();
if(!Utility::Resource::hasGroup("MagnumTextureTools"_s))
importTextureToolResources();
#endif #endif
Utility::Resource rs("MagnumTextureTools"_s); Utility::Resource rs("MagnumTextureTools"_s);

Loading…
Cancel
Save