Changeset 463 for trunk/src/gl/gl_context.cc

Timestamp:

08/28/15 18:28:34 (10 years ago)

Author:

epyon

Message:

• 3D/2D_ARRAY texture support

File:

• trunk/src/gl/gl_context.cc (modified) (4 diffs)

trunk/src/gl/gl_context.cc

@@ -111 +111 @@
 }
 
-void nv::gl_context::attach( framebuffer f, texture depth )
+void nv::gl_context::attach( framebuffer f, texture depth, int layer /*= -1*/ )
 {
         // TODO: framebuffer variable, so no re-binding?
@@ -121 +121 @@
                 glBindFramebuffer( GL_FRAMEBUFFER, info->glid );
                 unsigned gl_type = texture_type_to_enum( tinfo->type );
-                if ( tinfo )
-                {
-                        glFramebufferTexture2D( GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, gl_type, tinfo->glid, 0 );
+                unsigned glid = ( tinfo ? tinfo->glid : 0 );
+                if ( layer >= 0 )
+                {
+                        glFramebufferTextureLayer( GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, tinfo->glid, 0, layer );
                 }
                 else
                 {
-                        glFramebufferTexture2D( GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, gl_type, 0, 0 );
-                }
-        }
+                        glFramebufferTexture2D( GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, gl_type, glid, 0 );
+                }
+        }
+
 }
 
@@ -328 +330 @@
         {
                 image_format format  = info->format;
-                ivec2        size    = info->size;
+                ivec3        size    = info->size;
                 unsigned     gl_type = texture_type_to_enum( info->type );
 
                 glBindTexture( gl_type, info->glid );
-                glTexImage2D( gl_type, 0, static_cast<GLint>( nv::image_format_to_internal_enum(format.format) ), size.x, size.y, 0, nv::image_format_to_enum(format.format), nv::datatype_to_gl_enum(format.type), data );
+                if ( info->type == TEXTURE_3D || info->type == TEXTURE_2D_ARRAY )
+                        glTexImage3D( gl_type, 0, static_cast<GLint>( nv::image_format_to_internal_enum( format.format ) ), size.x, size.y, size.z, 0, nv::image_format_to_enum( format.format ), nv::datatype_to_gl_enum( format.type ), data );
+                else
+                        glTexImage2D( gl_type, 0, static_cast<GLint>( nv::image_format_to_internal_enum(format.format) ), size.x, size.y, 0, nv::image_format_to_enum(format.format), nv::datatype_to_gl_enum(format.type), data );
         }
 }
@@ -690 +695 @@
 {
         // TODO: configurable:
-        load_gl_extensions( GL_EXT_FRAMEBUFFER_BLIT | GL_EXT_FRAMEBUFFER_OBJECT );
+        load_gl_extensions( GL_EXT_FRAMEBUFFER_BLIT | GL_EXT_FRAMEBUFFER_OBJECT | GL_EXT_TEXTURE_ARRAY );
         force_apply_render_state( m_render_state );