Changeset 160 for trunk

Timestamp:

07/15/13 00:34:53 (12 years ago)

Author:

epyon

Message:

• gl.hh - added GL_GENERATE_MIPMAP (deprecated in GL 3.0, but substitute glGenerateMipmaps not available pre GL 3.0)
• gl_texture2d - mipmaps will be automatically generated if any of the mipmap dependent sampler parameters is used

Location:

trunk

Files:

• nv/lib/gl.hh (modified) (1 diff)
• src/gl/gl_texture2d.cc (modified) (1 diff)

trunk/nv/lib/gl.hh

@@ -363 +363 @@
 
 /* OpenGL 1.4 non-deprecated defines */
+// this one is actually deprecated, but the method glGenerateMipmap isn't available yet in 2.1
+#define GL_GENERATE_MIPMAP 0x8191 
 #define GL_BLEND_DST_RGB 0x80C8
 #define GL_BLEND_SRC_RGB 0x80C9

trunk/src/gl/gl_texture2d.cc

@@ -14 +14 @@
 {
         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 ) );