From: Mikko Rasa Date: Sat, 30 Oct 2021 19:54:00 +0000 (+0300) Subject: Clean up some more unused things X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=f853ca0a365ae8b43ba8b2f4d6f21cd1c2bd4bd5;p=libs%2Fgl.git Clean up some more unused things --- diff --git a/shaderlib/phong.glsl b/shaderlib/phong.glsl index 32fa43cc..080c9048 100644 --- 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 ec5bd18c..e2dd853c 100644 --- 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 8c31a53f..96fc7317 100644 --- 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("_ambientocclusion_occlude.glsl.shader")), diff --git a/source/effects/ambientocclusion.h b/source/effects/ambientocclusion.h index a9ffb81e..d055c685 100644 --- 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();