X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flighting.cpp;h=d1fd9a70ffc0febe50bd9335b753c87418e32549;hb=b152e4f63170e8ccd6c9fb9397964c628fb6efeb;hp=2ba1edc5560e00889ecd31fa01592f121a68a993;hpb=70663ae97d5b70a6b468e07dd7e73475a175dc9b;p=libs%2Fgl.git

diff --git a/source/lighting.cpp b/source/lighting.cpp
index 2ba1edc5..d1fd9a70 100644
--- a/source/lighting.cpp
+++ b/source/lighting.cpp
@@ -1,4 +1,6 @@
 #include <stdexcept>
+#include <msp/gl/extensions/msp_legacy_features.h>
+#include "error.h"
 #include "light.h"
 #include "lighting.h"
 #include "lightunit.h"
@@ -38,9 +40,6 @@ void Lighting::set_horizon_angle(const Geometry::Angle<float> &a)
 
 void Lighting::attach(unsigned i, const Light &l)
 {
-	if(i>=LightUnit::get_n_units())
-		throw out_of_range("Lighting::attach");
-
 	if(i>=lights.size())
 		lights.resize(i+1);
 
@@ -73,6 +72,10 @@ void Lighting::update_shader_data(ProgramData &shdata, const Matrix &view_matrix
 
 void Lighting::bind() const
 {
+	static Require _req(MSP_legacy_features);
+	if(lights.size()>LightUnit::get_n_units())
+		throw invalid_operation("Lighting::bind");
+
 	if(!set_current(this))
 		return;