Index: trunk/src/gl/gl_texture2d.cc
===================================================================
--- trunk/src/gl/gl_texture2d.cc	(revision 159)
+++ trunk/src/gl/gl_texture2d.cc	(revision 160)
@@ -14,4 +14,11 @@
 {
 	glBindTexture( GL_TEXTURE_2D, m_name.get_value() );
+
+	// Detect if mipmapping was requested
+	if (( asampler.filter_min != sampler::LINEAR && asampler.filter_min != sampler::NEAREST ) ||
+		( asampler.filter_max != sampler::LINEAR && asampler.filter_max != sampler::NEAREST ))
+	{
+		glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
+	}
 
 	glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, (int)nv::sampler_filter_to_enum( m_sampler.filter_min ) );