Changeset 121 for trunk/src/gl/gl_context.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_context.cc (modified) (4 diffs)

trunk/src/gl/gl_context.cc

@@ -83 +83 @@
 }
 
-void gl_context::apply_stencil_face( int face, stencil_test_face& stencil, const stencil_test_face& new_stencil )
+void gl_context::apply_stencil_face( unsigned face, stencil_test_face& stencil, const stencil_test_face& new_stencil )
 {
         if (( stencil.op_fail       != new_stencil.op_fail       ) ||
@@ -317 +317 @@
 }
 
-void gl_context::force_apply_stencil_face( int face, const stencil_test_face& stencil )
+void gl_context::force_apply_stencil_face( unsigned face, const stencil_test_face& stencil )
 {
         glStencilOpSeparate( face,
@@ -356 +356 @@
 }
 
-void gl_context::draw( primitive prim, const render_state& rs, program* p, vertex_array* va, int count )
+void gl_context::draw( primitive prim, const render_state& rs, program* p, vertex_array* va, size_t count )
 {
         apply_render_state( rs );
@@ -365 +365 @@
                 if ( va->has_index_buffer() )
                 {
-                        glDrawElements( primitive_to_enum(prim), count, datatype_to_gl_enum( va->get_index_buffer_type() ), 0 );
+                        glDrawElements( primitive_to_enum(prim), static_cast<GLsizei>( count ), datatype_to_gl_enum( va->get_index_buffer_type() ), 0 );
                 }
                 else
                 {
-                        glDrawArrays( primitive_to_enum(prim), 0, count);
+                        glDrawArrays( primitive_to_enum(prim), 0, static_cast<GLsizei>( count ) );
                 }
                 va->unbind();