Changeset 523 for trunk

Timestamp:

10/17/16 23:19:19 (9 years ago)

Author:

epyon

Message:

• attach depth
• minor fixes

Location:

trunk

Files:

• nv/gl/gl_context.hh (modified) (1 diff)
• nv/interface/context.hh (modified) (1 diff)
• src/engine/model_manager.cc (modified) (1 diff)
• src/gl/gl_context.cc (modified) (1 diff)

trunk/nv/gl/gl_context.hh

@@ -60 +60 @@
                 virtual void attach( framebuffer f, texture depth, int layer = -1 );
                 virtual void attach( framebuffer f, ivec2 size );
+                virtual void attach_depth( framebuffer source, framebuffer target );
+
                 virtual bool check( framebuffer_slot ft );
                 virtual void bind( framebuffer f, framebuffer_slot ft = FRAMEBUFFER );

trunk/nv/interface/context.hh

@@ -199 +199 @@
                 virtual void attach( framebuffer f, texture depth, int layer = -1 ) = 0;
                 virtual void attach( framebuffer f, ivec2 size ) = 0;
+                virtual void attach_depth( framebuffer source, framebuffer target ) = 0;
 
                 virtual bool check( framebuffer_slot ft ) = 0;

trunk/src/engine/model_manager.cc

@@ -57 +57 @@
 
         if ( table.is_string( "material" ) )
-                cmaterial = m_rm->get< material >( table.get_string128( "material" ) );
+        {
+                nv::string128 mat_id( table.get_string128( "material" ) );
+                cmaterial = m_rm->get< material >( mat_id );
+                if ( !cmaterial )
+                        NV_LOG_ERROR( "Can't load material : ", mat_id );
+        }
 
         if ( table.is_string( "tag" ) )

trunk/src/gl/gl_context.cc

@@ -212 +212 @@
 
 }
+
+void nv::gl_context::attach_depth( framebuffer source, framebuffer target )
+{
+        gl_framebuffer_info* sinfo = m_framebuffers.get( source );
+        gl_framebuffer_info* tinfo = m_framebuffers.get( target );
+
+        if ( sinfo && tinfo )
+        {
+                glBindFramebuffer( GL_FRAMEBUFFER, tinfo->glid );
+                // TODO: do we need to bind the renderbuffer at all?
+                glBindRenderbuffer( GL_RENDERBUFFER, sinfo->depth_rb_glid );
+                glFramebufferRenderbuffer( GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, sinfo->depth_rb_glid );
+                glBindRenderbuffer( GL_RENDERBUFFER, 0 );
+                glBindRenderbuffer( GL_FRAMEBUFFER, 0 );
+        }
+
+}
+
 
 void nv::gl_context::blit( framebuffer f, buffer_mask mask, ivec2 src1, ivec2 src2, ivec2 dst1, ivec2 dst2 )