Changeset 342 for trunk

Timestamp:

10/09/14 02:55:38 (11 years ago)

Author:

epyon

Message:

• gl_context - set_draw_buffers accepts const
• gl_context - set_draw_buffers with 1 buffer behaves like set_draw_buffer
• camera - holds viewport info (does not set it, should it?)
• clear_state - NONE added
• device/uniform - nv_v_viewport & nv_v_screen_size built-ins added

Location:

trunk

Files:

• nv/gl/gl_context.hh (modified) (1 diff)
• nv/interface/camera.hh (modified) (2 diffs)
• nv/interface/clear_state.hh (modified) (1 diff)
• nv/interface/context.hh (modified) (1 diff)
• nv/interface/device.hh (modified) (1 diff)
• nv/interface/uniform.hh (modified) (1 diff)
• src/gl/gl_context.cc (modified) (1 diff)

trunk/nv/gl/gl_context.hh

@@ -36 +36 @@
                 virtual const framebuffer_info* get_framebuffer_info( framebuffer f ) const;
 
-                virtual void set_draw_buffers( uint32 count, output_slot* slots );
+                virtual void set_draw_buffers( uint32 count, const output_slot* slots );
                 virtual void set_draw_buffer( output_slot slot );
                 virtual void set_read_buffer( output_slot slot );

trunk/nv/interface/camera.hh

@@ -70 +70 @@
                 void set_camera( const camera& c ) { m_camera = c; }
                 void set_model( const mat4& m )    { m_model  = m; } 
-
+                void set_viewport( const ivec4& v ){ m_viewport = v; }
+                const ivec4& get_viewport()  const { return m_viewport; }
                 const mat4& get_model()      const { return m_model; }
                 const mat4& get_view()       const { return m_camera.get_view(); }
@@ -83 +84 @@
                 mat4   m_model;
                 camera m_camera; 
+                ivec4  m_viewport;
         };
 

trunk/nv/interface/clear_state.hh

@@ -57 +57 @@
                 enum buffers_type
                 {
+                        NONE = 0,
                         COLOR_BUFFER = 1,
                         DEPTH_BUFFER = 2,

trunk/nv/interface/context.hh

@@ -89 +89 @@
                 virtual const framebuffer_info* get_framebuffer_info( framebuffer ) const = 0;
 
-                virtual void set_draw_buffers( uint32 count, output_slot* slots ) = 0;
+                virtual void set_draw_buffers( uint32 count, const output_slot* slots ) = 0;
                 virtual void set_draw_buffer( output_slot slot ) = 0;
                 virtual void set_read_buffer( output_slot slot ) = 0;

trunk/nv/interface/device.hh

@@ -265 +265 @@
                         factory_map[ "nv_v_camera_position" ]  = new engine_uniform_factory< engine_uniform_v_camera_position >();
                         factory_map[ "nv_v_camera_direction" ] = new engine_uniform_factory< engine_uniform_v_camera_direction >();
+                        factory_map[ "nv_v_viewport" ] = new engine_uniform_factory< engine_uniform_v_viewport >();
+                        factory_map[ "nv_v_screen_size" ] = new engine_uniform_factory< engine_uniform_v_screen_size >();
 
                         engine_link_uniform_factory_map& factory_link_map = get_link_uniform_factory();

trunk/nv/interface/uniform.hh

@@ -223 +223 @@
         };
 
+        class engine_uniform_v_viewport : public engine_uniform< ivec4 >
+        {
+        public:
+                engine_uniform_v_viewport( uniform_base* u ) : engine_uniform( u ) {}
+                virtual void set( const context* , const scene_state* s ) { m_uniform->set_value( s->get_viewport() ); }
+        };
+
+        class engine_uniform_v_screen_size : public engine_uniform< ivec2 >
+        {
+        public:
+                engine_uniform_v_screen_size( uniform_base* u ) : engine_uniform( u ) {}
+                virtual void set( const context* , const scene_state* s ) { m_uniform->set_value( nv::ivec2( s->get_viewport().z, s->get_viewport().w ) ); }
+        };
+
+
         template< int VALUE >
         class engine_link_uniform_int : public engine_link_uniform< int >

trunk/src/gl/gl_context.cc

@@ -719 +719 @@
 }
 
-void nv::gl_context::set_draw_buffers( uint32 count, output_slot* slots )
-{
+void nv::gl_context::set_draw_buffers( uint32 count, const output_slot* slots )
+{
+        if ( count == 0 ) return;
+        if ( count == 1 )
+        {
+                set_draw_buffer( slots[0] );
+                return;
+        }
         unsigned int buffers[8];
         count = glm::min<uint32>( count, 8 );