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

Timestamp:

06/08/16 20:14:43 (9 years ago)

Author:

epyon

Message:

• massive particle_engine updates
• more image data types
• texture layers for framebuffers

File:

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

trunk/src/gl/gl_context.cc

@@ -132 +132 @@
 }
 
-void nv::gl_context::attach( framebuffer f, output_slot slot, texture t )
+void nv::gl_context::attach( framebuffer f, output_slot slot, texture t, int layer /* = -1*/ )
 {
         // TODO: framebuffer variable, so no re-binding?
@@ -143 +143 @@
                 glBindFramebuffer( GL_FRAMEBUFFER, info->glid );
                 unsigned gl_type = texture_type_to_enum( tinfo->type );
-
-                if ( tinfo )
-                {
-                        //              if ( tinfo->size.y == 0 )
-                                //                      glFramebufferTexture1D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0+(unsigned)slot, GL_TEXTURE_1D, tinfo->glid, 0 );
-                        glFramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0+unsigned( slot ), gl_type, tinfo->glid, 0 );
+                unsigned tglid = tinfo ? tinfo->glid : 0;
+
+                if ( layer >= 0 )
+                {
+                        glFramebufferTextureLayer( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + unsigned( slot ), tglid, 0, layer );
                 }
                 else
                 {
-                        glFramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0+unsigned( slot ), gl_type, 0, 0 );
+                        glFramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + unsigned( slot ), gl_type, tglid, 0 );
                 }
 
@@ -171 +170 @@
                 if ( layer >= 0 )
                 {
-                        glFramebufferTextureLayer( GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, tinfo->glid, 0, layer );
+                        glFramebufferTextureLayer( GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, glid, 0, layer );
                 }
                 else