Changeset 473 for trunk

Timestamp:

10/09/15 14:06:56 (10 years ago)

Author:

epyon

Message:

• rtti updates
• device/context initial uniform buffer support
• fixes

Location:

trunk

Files:

• nv/base/rtti_support.hh (modified) (1 diff)
• nv/core/arcball.hh (modified) (1 diff)
• nv/gl/gl_context.hh (modified) (1 diff)
• nv/gl/gl_device.hh (modified) (1 diff)
• nv/interface/context.hh (modified) (1 diff)
• nv/interface/device.hh (modified) (3 diffs)
• nv/stl/string/short_string.hh (modified) (2 diffs)
• src/gl/gl_context.cc (modified) (4 diffs)
• src/gl/gl_device.cc (modified) (3 diffs)
• src/gl/gl_enum.cc (modified) (1 diff)

trunk/nv/base/rtti_support.hh

@@ -17 +17 @@
 
 #define NV_RTTI_DECLARE(T) \
-namespace nv { \
-template<> struct rtti_type_hash< T > { \
+template<> struct ::nv::rtti_type_hash< T > { \
+NV_MSVC_SUPRESS( 4307 )\
+        static const nv::uint64 value = nv::rtti_const_hash(#T); \
         static const char* name() { return #T; } \
         static nv::uint64 hash() { \
-NV_MSVC_SUPRESS( 4307 )\
-                static const nv::uint64 value = nv::rtti_const_hash(#T); \
                 return value; \
         } \
-};} \
+}; \
 
 #define NV_RTTI_DECLARE_NAME(T,NAME) \
-namespace nv { \
-template<> struct rtti_type_hash< T > { \
+template<> struct ::nv::rtti_type_hash< T > { \
+NV_MSVC_SUPRESS( 4307 )\
+        static const nv::uint64 value = nv::rtti_const_hash(#T); \
         static const char* name() { return NAME; } \
         static nv::uint64 hash() { \
-NV_MSVC_SUPRESS( 4307 )\
-                static const nv::uint64 value = nv::rtti_const_hash(#T); \
                 return value; \
                                 } \
-};} \
+}; \
 
 namespace nv

trunk/nv/core/arcball.hh

@@ -50 +50 @@
                         vec3 vb = get_arcball_vector( nposition );
 
-                        m_angle = math::acos( math::min( 1.0f, math::dot( va, vb ) ) );
+                        m_angle = nv::acos( math::min( 1.0f, math::dot( va, vb ) ) );
                         m_axis  = math::cross( va, vb );
                         m_last  = nposition;

trunk/nv/gl/gl_context.hh

@@ -48 +48 @@
                 virtual void bind( framebuffer f, framebuffer_slot ft = FRAMEBUFFER );
                 virtual void bind( texture t, texture_slot slot );
+                virtual void bind( buffer b, uint32 index, size_t offset = 0, size_t size = 0 );
 
                 virtual void update( texture t, const void* data );
                 virtual void update( buffer b, const void* data, size_t offset, size_t size );
+                virtual void update( buffer b, uint32 index, const void* data, size_t offset, size_t size );
 
                 virtual void clear( const clear_state& cs );
                 // temporary
-                virtual void draw( primitive prim, const render_state& rs, program p, vertex_array va, size_t count );
+                virtual void draw( primitive prim, const render_state& rs, program p, vertex_array va, size_t count, size_t first = 0 );
                 virtual const ivec4& get_viewport();
                 virtual void set_viewport( const ivec4& viewport );

trunk/nv/gl/gl_device.hh

@@ -56 +56 @@
 
                 virtual int get_attribute_location( program p, const string_view& name, bool fatal = true ) const;
+                virtual int get_block_location( program p, const string_view& name, bool fatal = true ) const;
                 virtual void prepare_program( program p );
                 virtual string_view get_shader_header() const { return m_shader_header; }

trunk/nv/interface/context.hh

@@ -102 +102 @@
                 virtual void bind( framebuffer f, framebuffer_slot slot = FRAMEBUFFER ) = 0;
                 virtual void bind( texture, texture_slot ) = 0;
+                virtual void bind( buffer, uint32 /*index*/, size_t /*offset*/ = 0, size_t /*size */= 0 ) = 0;
+
                 virtual void update( texture, const void* ) = 0;
                 virtual void update( buffer, const void*, size_t /*offset*/, size_t /*size*/ ) = 0;
+                virtual void update( buffer, uint32 /*index*/, const void* , size_t /*offset*/, size_t /*size*/ ) = 0;
 
                 virtual void clear( const clear_state& cs ) = 0;
                 // temporary
-                virtual void draw( primitive prim, const render_state& rs, program p, vertex_array va, size_t count ) = 0;
-
-                void draw( primitive prim, const render_state& rs, const scene_state& s, program p, vertex_array va, size_t count )
+                virtual void draw( primitive prim, const render_state& rs, program p, vertex_array va, size_t count, size_t first = 0 ) = 0;
+
+                void draw( primitive prim, const render_state& rs, const scene_state& s, program p, vertex_array va, size_t count, size_t first = 0 )
                 {
                         apply_engine_uniforms(p,s);
-                        draw( prim, rs, p, va, count );
+                        draw( prim, rs, p, va, count, first );
                 }
                 virtual void apply_engine_uniforms( program p, const scene_state& s ) = 0;

trunk/nv/interface/device.hh

@@ -82 +82 @@
         struct buffer_tag {};
         struct program_tag {};
+
         typedef handle< uint32, 16, 16, buffer_tag >       buffer;
         typedef handle< uint32, 16, 16, texture_tag >      texture;
         typedef handle< uint32, 16, 16, program_tag >      program;
+
+        NV_RTTI_DECLARE_NAME( buffer,  "buffer" )
+        NV_RTTI_DECLARE_NAME( texture, "texture" )
+        NV_RTTI_DECLARE_NAME( program, "program" )
 
         struct sampler
@@ -129 +134 @@
                 VERTEX_BUFFER,
                 INDEX_BUFFER,
+                UNIFORM_BUFFER,
         };
 
@@ -198 +204 @@
                 }
 
+                int try_get_block_location( program p, const string_view& name ) const
+                {
+                        return get_block_location( p, name, false );
+                }
+
                 virtual int get_attribute_location( program p, const string_view& name, bool fatal = true ) const = 0;
+                virtual int get_block_location( program p, const string_view& name, bool fatal = true ) const = 0;
+
 
                 template < typename T >

trunk/nv/stl/string/short_string.hh

@@ -145 +145 @@
                 {
                         Storage::reserve( new_size + 1 );
-                        Storage::resize( min( new_size, capacity() - 1 ) );
+                        Storage::resize( min( new_size, this->capacity() - 1 ) );
                         this->data()[this->size()] = 0;
                 }
@@ -172 +172 @@
                         else
                         {
-                                result = capacity() - this->size() - 1;
-                                Storage::try_resize( capacity() - 1, true, 1 );
+                                result = this->capacity() - this->size() - 1;
+                                Storage::try_resize( this->capacity() - 1, true, 1 );
                         }
                         this->data()[this->size()] = 0;

trunk/src/gl/gl_context.cc

@@ -205 +205 @@
         {
                 glBindFramebuffer( framebuffer_slot_to_enum(ft), 0 );
+        }
+}
+
+void nv::gl_context::bind( buffer b, uint32 index, size_t offset /*= 0*/, size_t size /*= 0 */ )
+{
+        const gl_buffer_info* info = static_cast< const gl_buffer_info* >( m_device->get_buffer_info( b ) );
+        if ( info )
+        {
+                if ( size == 0 )
+                        glBindBufferBase( buffer_type_to_enum( info->type ), index, info->glid );
+                else
+                        glBindBufferRange( buffer_type_to_enum( info->type ), index, info->glid, offset, size );
         }
 }
@@ -339 +351 @@
                 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 );
+        }
+}
+
+void nv::gl_context::update( buffer b, uint32 index, const void* data, size_t offset, size_t size )
+{
+        const gl_buffer_info* info = static_cast<const gl_buffer_info*>( m_device->get_buffer_info( b ) );
+        if ( info )
+        {
+                GLenum glenum = buffer_type_to_enum( info->type );
+                if ( size == 0 )
+                        glBindBufferBase( glenum, index, info->glid );
+                else
+                        glBindBufferRange( glenum, index, info->glid, offset, size );
+                glBufferSubData( glenum, GLintptr( offset ), GLsizeiptr( size ), data );
         }
 }
@@ -750 +776 @@
 }
 
-void gl_context::draw( primitive prim, const render_state& rs, program p, vertex_array va, nv::size_t count )
+void gl_context::draw( primitive prim, const render_state& rs, program p, vertex_array va, nv::size_t count, nv::size_t first )
 {
         apply_render_state( rs );
@@ -760 +786 @@
                 if ( info->index.is_valid() )
                 {
-                        glDrawElements( primitive_to_enum(prim), static_cast<GLsizei>( count ), datatype_to_gl_enum( info->index_type ), 0 );
+                        glDrawElements( primitive_to_enum(prim), static_cast<GLsizei>( count ), datatype_to_gl_enum( info->index_type ), reinterpret_cast< const void* >( get_datatype_info( info->index_type ).size * first ) );
                 }
                 else
                 {
-                        glDrawArrays( primitive_to_enum(prim), 0, static_cast<GLsizei>( count ) );
+                        glDrawArrays( primitive_to_enum(prim), first, static_cast<GLsizei>( count ) );
                 }
                 unbind( va );

trunk/src/gl/gl_device.cc

@@ -337 +337 @@
                 }
         }
+        return -1;
+}
+
+int nv::gl_device::get_block_location( program p, const string_view& name, bool fatal /*= true */ ) const
+{
         return -1;
 }
@@ -450 +455 @@
 {
         int params;
+        int bparams;
         glGetProgramiv( p->glid, GL_ACTIVE_UNIFORMS, &params );
+        glGetProgramiv( p->glid, GL_ACTIVE_UNIFORM_BLOCKS, &bparams );
 
         for ( unsigned i = 0; i < unsigned( params ); ++i )
@@ -479 +486 @@
                 NV_ASSERT( u, "Unknown uniform type!" );
                 (*p->m_uniform_map)[ name ] = u;
+        }
+
+        for ( unsigned i = 0; i < unsigned( bparams ); ++i )
+        {
+                int uni_len;
+                char name_buffer[128];
+
+                glGetActiveUniformBlockName( p->glid, i, 128, &uni_len, name_buffer );
+                NV_LOG_INFO( string_view( name_buffer, size_t( uni_len ) ) );
         }
 }

trunk/src/gl/gl_enum.cc

@@ -168 +168 @@
         switch( type )
         {
-        case VERTEX_BUFFER : return GL_ARRAY_BUFFER;
-        case INDEX_BUFFER  : return GL_ELEMENT_ARRAY_BUFFER;
+        case VERTEX_BUFFER  : return GL_ARRAY_BUFFER;
+        case INDEX_BUFFER   : return GL_ELEMENT_ARRAY_BUFFER;
+        case UNIFORM_BUFFER : return GL_UNIFORM_BUFFER;
                 NV_RETURN_COVERED_DEFAULT( 0 );
         }