Changeset 522 for trunk/src/engine/renderer.cc

Timestamp:

10/14/16 18:17:17 (9 years ago)

Author:

epyon

Message:

• updates lol

File:

• trunk/src/engine/renderer.cc (modified) (2 diffs)

trunk/src/engine/renderer.cc

@@ -117 +117 @@
 
         scene_state ss( s );
+        render_state rs( pass.rstate );
         m_context->bind( pass.fbuffer, FRAMEBUFFER );
         m_context->set_draw_buffers( pass.output_count, pass.output );
@@ -157 +158 @@
                                         m_context->get_device()->set_opt_uniform( *program, "nv_index", unsigned( index ) );
                                         m_context->apply_engine_uniforms( *program, ss );
+                                        if ( rs.blending != element.blending )
+                                                rs.blending = element.blending;
 
                                         if ( element.instances > 0 )
-                                                m_context->draw_instanced( TRIANGLES, pass.rstate, *program, element.instances, element.va, element.count, element.first );
+                                                m_context->draw_instanced( TRIANGLES, rs, *program, element.instances, element.va, element.count, element.first );
                                         else
-                                                m_context->draw( TRIANGLES, pass.rstate, *program, element.va, element.count, element.first );
+                                                m_context->draw( TRIANGLES, rs, *program, element.va, element.count, element.first );
 
                                         m_statistics[TRIANGLE_COUNT] += ( element.count / 3 ) * max< uint32 >( element.instances, 1 );