Browse Source

Shaders: initialize all members also with NoCreate.

Otherwise the _lightCount gets a random value, which makes debugging of
accidentally not created instances harder than strictly necessary.
pull/491/head
Vladimír Vondruš 5 years ago
parent
commit
d00d1cb781
  1. 2
      src/Magnum/Shaders/Phong.h
  2. 1
      src/Magnum/Shaders/Test/DistanceFieldVectorTest.cpp
  3. 1
      src/Magnum/Shaders/Test/FlatTest.cpp
  4. 2
      src/Magnum/Shaders/Test/MeshVisualizerTest.cpp
  5. 2
      src/Magnum/Shaders/Test/PhongTest.cpp
  6. 1
      src/Magnum/Shaders/Test/VectorTest.cpp

2
src/Magnum/Shaders/Phong.h

@ -1017,7 +1017,7 @@ class MAGNUM_SHADERS_EXPORT Phong: public GL::AbstractShaderProgram {
#endif
Flags _flags;
UnsignedInt _lightCount;
UnsignedInt _lightCount{};
Int _transformationMatrixUniform{0},
_projectionMatrixUniform{1},
_normalMatrixUniform{2},

1
src/Magnum/Shaders/Test/DistanceFieldVectorTest.cpp

@ -58,6 +58,7 @@ template<UnsignedInt dimensions> void DistanceFieldVectorTest::constructNoCreate
{
DistanceFieldVector<dimensions> shader{NoCreate};
CORRADE_COMPARE(shader.id(), 0);
CORRADE_COMPARE(shader.flags(), typename DistanceFieldVector<dimensions>::Flags{});
}
CORRADE_VERIFY(true);

1
src/Magnum/Shaders/Test/FlatTest.cpp

@ -60,6 +60,7 @@ template<UnsignedInt dimensions> void FlatTest::constructNoCreate() {
{
Flat<dimensions> shader{NoCreate};
CORRADE_COMPARE(shader.id(), 0);
CORRADE_COMPARE(shader.flags(), typename Flat<dimensions>::Flags{});
}
CORRADE_VERIFY(true);

2
src/Magnum/Shaders/Test/MeshVisualizerTest.cpp

@ -67,6 +67,7 @@ void MeshVisualizerTest::constructNoCreate2D() {
{
MeshVisualizer2D shader{NoCreate};
CORRADE_COMPARE(shader.id(), 0);
CORRADE_COMPARE(shader.flags(), MeshVisualizer2D::Flags{});
}
CORRADE_VERIFY(true);
@ -76,6 +77,7 @@ void MeshVisualizerTest::constructNoCreate3D() {
{
MeshVisualizer3D shader{NoCreate};
CORRADE_COMPARE(shader.id(), 0);
CORRADE_COMPARE(shader.flags(), MeshVisualizer3D::Flags{});
}
CORRADE_VERIFY(true);

2
src/Magnum/Shaders/Test/PhongTest.cpp

@ -55,6 +55,8 @@ void PhongTest::constructNoCreate() {
{
Phong shader{NoCreate};
CORRADE_COMPARE(shader.id(), 0);
CORRADE_COMPARE(shader.flags(), Phong::Flags{});
CORRADE_COMPARE(shader.lightCount(), 0);
}
CORRADE_VERIFY(true);

1
src/Magnum/Shaders/Test/VectorTest.cpp

@ -58,6 +58,7 @@ template<UnsignedInt dimensions> void VectorTest::constructNoCreate() {
{
Vector<dimensions> shader{NoCreate};
CORRADE_COMPARE(shader.id(), 0);
CORRADE_COMPARE(shader.flags(), typename Vector<dimensions>::Flags{});
}
CORRADE_VERIFY(true);

Loading…
Cancel
Save