Changeset 331 for trunk/src/gl/gl_device.cc

Timestamp:

09/09/14 20:08:33 (11 years ago)

Author:

epyon

Message:

• texture types (1D,2D,Rect,3D,Cube - not all fully supported yet)
• full framebuffer support
• fixes to texture support
• minor fixes

File:

• trunk/src/gl/gl_device.cc (modified) (1 diff)

trunk/src/gl/gl_device.cc

@@ -62 +62 @@
 }
 
-nv::texture nv::gl_device::create_texture( ivec2 size, image_format aformat, sampler asampler, void* data /*= nullptr */ )
+nv::texture nv::gl_device::create_texture( texture_type type, ivec2 size, image_format aformat, sampler asampler, void* data /*= nullptr */ )
 {
         unsigned glid = 0;
+        unsigned gl_type = texture_type_to_enum( type );
         glGenTextures( 1, &glid );
 
-        glBindTexture( GL_TEXTURE_2D, glid );
+        glBindTexture( gl_type, glid );
 
         // 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( asampler.filter_min ) );
-        glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, (int)nv::sampler_filter_to_enum( asampler.filter_max ) );
-        glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, (int)nv::sampler_wrap_to_enum( asampler.wrap_s) );
-        glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, (int)nv::sampler_wrap_to_enum( asampler.wrap_t) );
-
-        if (data)
-        {
-                glTexImage2D( GL_TEXTURE_2D, 0, (GLint)nv::image_format_to_enum(aformat.format), size.x, size.y, 0, nv::image_format_to_enum(aformat.format), nv::datatype_to_gl_enum(aformat.type), data );
-        }
-
-        glBindTexture( GL_TEXTURE_2D, 0 );
+        if ( gl_type == GL_TEXTURE_2D && asampler.filter_min != sampler::LINEAR && asampler.filter_min != sampler::NEAREST )
+        {
+                // TODO: This should not be done if we use framebuffers!
+                glTexParameteri( gl_type, GL_GENERATE_MIPMAP, GL_TRUE);
+        }
+
+        if ( asampler.filter_max != sampler::NEAREST )
+        {
+                asampler.filter_max = sampler::LINEAR;
+        }
+
+        glTexParameteri( gl_type, GL_TEXTURE_MIN_FILTER, (int)nv::sampler_filter_to_enum( asampler.filter_min ) );
+        glTexParameteri( gl_type, GL_TEXTURE_MAG_FILTER, (int)nv::sampler_filter_to_enum( asampler.filter_max ) );
+        glTexParameteri( gl_type, GL_TEXTURE_WRAP_S, (int)nv::sampler_wrap_to_enum( asampler.wrap_s) );
+        glTexParameteri( gl_type, GL_TEXTURE_WRAP_T, (int)nv::sampler_wrap_to_enum( asampler.wrap_t) );
+
+        glTexImage2D( gl_type, 0, (GLint)nv::image_format_to_internal_enum(aformat.format), size.x, size.y, 0, nv::image_format_to_enum(aformat.format), nv::datatype_to_gl_enum(aformat.type), data );
+
+        glBindTexture( gl_type, 0 );
 
         texture result = m_textures.create();
         gl_texture_info* info = m_textures.get( result );
+        info->type     = type;
         info->format   = aformat;
         info->tsampler = asampler;