X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Frenderer.cpp;h=a8f5ce3ab07f9ea3c6ef867678043315f84394de;hp=7389298a0ebe3c8db298ab72154a83d4aa949c7a;hb=2d3113a7dbbe4be2f1d1e8980c1c4e42175163da;hpb=45de0062950ad822ed0379ed4fe807d333e1b8f1

diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp
index 7389298a..a8f5ce3a 100644
--- a/source/render/renderer.cpp
+++ b/source/render/renderer.cpp
@@ -2,6 +2,7 @@
 #include "buffer.h"
 #include "camera.h"
 #include "clipping.h"
+#include "deviceinfo.h"
 #include "error.h"
 #include "lighting.h"
 #include "material.h"
@@ -182,13 +183,13 @@ void Renderer::add_shader_data(const ProgramData &d)
 		}
 	}
 
-	flush_shader_data();
+	flush_shader_data_();
 	shdata_stack.push_back(&d);
 	state->shdata_count = shdata_stack.size();
 	changed |= SHADER_DATA;
 }
 
-void Renderer::flush_shader_data()
+void Renderer::flush_shader_data_()
 {
 	if(shdata_stack.size()>state->shdata_count)
 		shdata_stack.erase(shdata_stack.begin()+state->shdata_count, shdata_stack.end());
@@ -401,7 +402,7 @@ Renderer::BoundProgramData::BoundProgramData(const ProgramData *d):
 Renderer::State::State():
 	camera(0),
 	texture_count(0),
-	lowest_effect_texunit(TexUnit::get_n_units()),
+	lowest_effect_texunit(Limits::get_global().max_texture_bindings),
 	clipping(0),
 	shprog(0),
 	shdata_count(0),