Clean up some more unused things

diff --git a/shaderlib/phong.glsl b/shaderlib/phong.glsl
index 32fa43cc61ef6143343fd893c2d304ee72107229..080c904895668f1e985a893ef959fb467ee0a91d 100644 (file)
--- a/shaderlib/phong.glsl
+++ b/shaderlib/phong.glsl
@@ -30,8 +30,6 @@ layout(constant_id=auto) const bool use_emission = false;
 layout(constant_id=auto) const bool use_emission_map = false;
 layout(constant_id=auto) const bool use_reflectivity = false;
 layout(constant_id=auto) const bool use_reflectivity_map = false;
-layout(constant_id=auto) const bool use_sky = false;
-layout(constant_id=auto) const bool use_fog = false;
 
 #pragma MSP stage(fragment)
 virtual vec4 get_diffuse_color()

diff --git a/source/core/mesh.cpp b/source/core/mesh.cpp
index ec5bd18cf392e375c36ee49cfcfe9e51050e4d40..e2dd853c448dff6c25259bcb42aa46d6a1433c70 100644 (file)
--- a/source/core/mesh.cpp
+++ b/source/core/mesh.cpp
@@ -9,8 +9,7 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Mesh::Mesh(const VertexFormat &f):
-       Mesh()
+Mesh::Mesh(const VertexFormat &f)
 {
        storage(f);
 }

diff --git a/source/effects/ambientocclusion.cpp b/source/effects/ambientocclusion.cpp
index 8c31a53fb115ddfe5ff25dd1f540e60132f6dc5b..96fc7317a9b2fe5727c66f6bdea5362496cd5d76 100644 (file)
--- a/source/effects/ambientocclusion.cpp
+++ b/source/effects/ambientocclusion.cpp
@@ -12,7 +12,7 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-AmbientOcclusion::AmbientOcclusion(unsigned w, unsigned h, float):
+AmbientOcclusion::AmbientOcclusion(unsigned w, unsigned h):
        rotate_lookup(get_or_create_rotate_lookup()),
        occlude_target(w, h, (COLOR_ATTACHMENT,R8)),
        occlude_shader(Resources::get_global().get<Program>("_ambientocclusion_occlude.glsl.shader")),

diff --git a/source/effects/ambientocclusion.h b/source/effects/ambientocclusion.h
index a9ffb81e2ac4d52c82557400da03835f6a8a0ef1..d055c6851e1aa362c4aaab1ea2fb8a3c91ef5662 100644 (file)
--- a/source/effects/ambientocclusion.h
+++ b/source/effects/ambientocclusion.h
@@ -46,7 +46,7 @@ private:
        const Sampler &nearest_sampler;
 
 public:
-       AmbientOcclusion(unsigned, unsigned, float = 1.0f);
+       AmbientOcclusion(unsigned, unsigned);
 
 private:
        static const Texture2D &get_or_create_rotate_lookup();