Browse Source

Fixes

pull/576/head
Vladislav Oleshko 4 years ago
parent
commit
09ab0ef579
  1. 7
      src/Magnum/Shaders/PhongGL.cpp
  2. 2
      src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp

7
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<PhongGL&&>(std::move(cs))} {
if (id() == 0) return;
@ -457,6 +457,9 @@ PhongGL::PhongGL(CompileState&& cs)
/* Object ID is zero by default */
}
#endif
static_cast<void>(context);
static_cast<void>(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)} {}

2
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);

Loading…
Cancel
Save