Changeset 42 for trunk

Timestamp:

05/28/13 12:21:27 (12 years ago)

Author:

epyon

Message:

• vertex_buffer interface and implementation

Location:

trunk

Files:

• nv/gl/gl_device.hh (modified) (1 diff)
• nv/gl/gl_enum.hh (modified) (2 diffs)
• nv/gl/gl_vertex_buffer.hh (added)
• nv/interface/device.hh (modified) (2 diffs)
• nv/interface/vertex_buffer.hh (added)
• src/gl/gl_device.cc (modified) (3 diffs)
• src/gl/gl_enum.cc (modified) (1 diff)
• src/gl/gl_vertex_buffer.cc (added)

trunk/nv/gl/gl_device.hh

@@ -23 +23 @@
                 virtual window* create_window( uint16 width, uint16 height );
                 virtual program* create_program( const string& vs_source, const string& fs_source );
+                virtual vertex_buffer* create_vertex_buffer( buffer_hint hint, int size, void* source = nullptr );
                 virtual ~gl_device();
         private:

trunk/nv/gl/gl_enum.hh

@@ -15 +15 @@
 #include <nv/interface/clear_state.hh>
 #include <nv/interface/render_state.hh>
+#include <nv/interface/vertex_buffer.hh>
 #include <nv/types.hh>
 
@@ -28 +29 @@
         unsigned int stencil_function_to_enum( stencil_test_face::function_type type );
         unsigned int stencil_operation_to_enum( stencil_test_face::operation type );
+        unsigned int buffer_hint_to_enum( buffer_hint hint );
 
         unsigned int type_to_gl_enum( type type );

trunk/nv/interface/device.hh

@@ -15 +15 @@
 #include <nv/common.hh>
 #include <nv/string.hh>
+#include <nv/interface/vertex_buffer.hh>
 
 namespace nv
@@ -26 +27 @@
                 virtual window* create_window( uint16 width, uint16 height ) = 0;
                 virtual program* create_program( const string& vs_source, const string& fs_source ) = 0;
+                virtual vertex_buffer* create_vertex_buffer( buffer_hint hint, int size, void* source = nullptr ) = 0;
         };
 

trunk/src/gl/gl_device.cc

@@ -7 +7 @@
 #include "nv/gl/gl_window.hh"
 #include "nv/gl/gl_program.hh"
+#include "nv/gl/gl_vertex_buffer.hh"
 #include "nv/logging.hh"
 #include "nv/lib/sdl12.hh"
@@ -50 +51 @@
 }
 
+vertex_buffer* gl_device::create_vertex_buffer( buffer_hint hint, int size, void* source /*= nullptr */ )
+{
+        return new gl_vertex_buffer( hint, size, source );
+}
 
 gl_device::~gl_device()
@@ -55 +60 @@
         SDL_Quit();
 }
+

trunk/src/gl/gl_enum.cc

@@ -123 +123 @@
 }
 
+unsigned int nv::buffer_hint_to_enum( buffer_hint hint )
+{
+        switch( hint )
+        {
+        case STATIC_DRAW   : return GL_STATIC_DRAW;
+        case STREAM_DRAW   : return GL_STREAM_DRAW;
+        case DYNAMIC_DRAW  : return GL_DYNAMIC_DRAW;
+        default : return 0; // TODO: throw!
+        }
+}
+
 unsigned int nv::type_to_gl_enum( type type )
 {