Changeset 121 for trunk/src/gl/gl_vertex_buffer.cc

Timestamp:

06/15/13 17:47:57 (12 years ago)

Author:

epyon

Message:

• Nova builds with -Weverything/-Wall/-pedantic/etc on: on MSVC 2012 on GCC 4.6.3 on clang 3.2
• ... without a single fucking warning.

File:

• trunk/src/gl/gl_vertex_buffer.cc (modified) (5 diffs)

trunk/src/gl/gl_vertex_buffer.cc

@@ -10 +10 @@
 using namespace nv;
 
-gl_vertex_buffer::gl_vertex_buffer( buffer_hint hint, int size, void* data ) 
+gl_vertex_buffer::gl_vertex_buffer( buffer_hint hint, size_t size, void* data ) 
         : vertex_buffer( hint, size ), m_name()
 {
         bind();
-        glBufferData( GL_ARRAY_BUFFER, m_size, data, buffer_hint_to_enum( m_hint ) );
+        glBufferData( GL_ARRAY_BUFFER, (GLsizeiptr)m_size, data, buffer_hint_to_enum( m_hint ) );
         unbind();
 }
 
-void gl_vertex_buffer::update( void* data, int offset, int size )
+void gl_vertex_buffer::update( void* data, size_t offset, size_t size )
 {
-        glBufferSubData( GL_ARRAY_BUFFER, offset, size, data );
+        glBufferSubData( GL_ARRAY_BUFFER, (GLintptr)offset, (GLsizeiptr)size, data );
 }
 
@@ -39 +39 @@
 }
 
-gl_index_buffer::gl_index_buffer( buffer_hint hint, int size, void* data ) 
+gl_index_buffer::gl_index_buffer( buffer_hint hint, size_t size, void* data ) 
         : index_buffer( hint, size ), m_name()
 {
         bind();
-        glBufferData( GL_ELEMENT_ARRAY_BUFFER, m_size, data, buffer_hint_to_enum( m_hint ) );
+        glBufferData( GL_ELEMENT_ARRAY_BUFFER, (GLsizeiptr)m_size, data, buffer_hint_to_enum( m_hint ) );
         unbind();
 }
 
-void gl_index_buffer::update( void* data, int offset, int size )
+void gl_index_buffer::update( void* data, size_t offset, size_t size )
 {
-        glBufferSubData( GL_ELEMENT_ARRAY_BUFFER, offset, size, data );
+        glBufferSubData( GL_ELEMENT_ARRAY_BUFFER, (GLintptr)offset, (GLsizeiptr)size, data );
 }
 
@@ -76 +76 @@
         for ( vertex_buffer_attribute_map::iterator i = m_map.begin();  i != m_map.end(); ++i ) 
         {
-                int location                = i->first;
+                uint32 location             = static_cast<uint32>( i->first );
                 vertex_buffer_attribute* va = i->second;
                 vertex_buffer*           vb = va->get_buffer();
@@ -83 +83 @@
                 glVertexAttribPointer( 
                         location, 
-                        va->get_components(), 
+                        static_cast<GLint>( va->get_components() ), 
                         nv::datatype_to_gl_enum( va->get_datatype() ),
                         GL_FALSE,
-                        va->get_stride(),
+                        static_cast<GLsizei>( va->get_stride() ),
                         (void*)va->get_offset()
                         );
@@ -107 +107 @@
         for ( vertex_buffer_attribute_map::iterator i = m_map.begin();  i != m_map.end(); ++i ) 
         {
-                glDisableVertexAttribArray( i->first );
+                glDisableVertexAttribArray( static_cast<uint32>( i->first ) );
         }
 }