From 09ab0ef5795cdae32f5d629d7c61a024737e057a Mon Sep 17 00:00:00 2001 From: Vladislav Oleshko Date: Sat, 13 Aug 2022 14:17:26 +0300 Subject: [PATCH] Fixes --- src/Magnum/Shaders/PhongGL.cpp | 7 +++++-- src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Magnum/Shaders/PhongGL.cpp b/src/Magnum/Shaders/PhongGL.cpp index 125e6a552..bc4ef5256 100644 --- a/src/Magnum/Shaders/PhongGL.cpp +++ b/src/Magnum/Shaders/PhongGL.cpp @@ -345,7 +345,7 @@ PhongGL::CompileState PhongGL::compile(const Flags flags, const UnsignedInt ligh return CompileState{std::move(out), std::move(vert), std::move(frag), version}; } -PhongGL::PhongGL(CompileState&& cs) +PhongGL::PhongGL(CompileState&& cs) : PhongGL{static_cast(std::move(cs))} { if (id() == 0) return; @@ -457,6 +457,9 @@ PhongGL::PhongGL(CompileState&& cs) /* Object ID is zero by default */ } #endif + + static_cast(context); + static_cast(version); } PhongGL::PhongGL(Flags flags, UnsignedInt lightCount) : PhongGL{compile(flags, lightCount)} {} @@ -464,7 +467,7 @@ PhongGL::PhongGL(Flags flags, UnsignedInt lightCount) : PhongGL{compile(flags, l #ifndef MAGNUM_TARGET_GLES2 PhongGL::CompileState PhongGL::compile(Flags flags, UnsignedInt lightCount) { return compile(flags, lightCount, 1, 1); -} +} PhongGL::PhongGL(Flags flags, UnsignedInt lightCount, UnsignedInt materialCount, UnsignedInt drawCount) : PhongGL{compile(flags, lightCount, materialCount, drawCount)} {} diff --git a/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp index ce9289789..31319306e 100644 --- a/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp +++ b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp @@ -1722,7 +1722,7 @@ void MeshVisualizerGLTest::construct3DAsync() { const char* name; MeshVisualizerGL3D::Flags flags; } data { - "object ID texture array", MeshVisualizerGL3D::Flag::ObjectIdTexture|MeshVisualizerGL3D::Flag::TextureArrays + "wireframe w/o GS", MeshVisualizerGL3D::Flag::Wireframe|MeshVisualizerGL3D::Flag::NoGeometryShader }; setTestCaseDescription(data.name);