Changeset 121 for trunk/src/gl/gl_program.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_program.cc (modified) (6 diffs)

trunk/src/gl/gl_program.cc

@@ -14 +14 @@
 using namespace nv;
 
-gl_shader::gl_shader( uint32 shader_type ) 
-        : object_id(0), shader_type( shader_type )
+gl_shader::gl_shader( uint32 sh_type ) 
+        : shader_type( sh_type ), object_id(0)
 {
         // no op
 }
 
-gl_shader::gl_shader( uint32 shader_type, const string& shader_code )
-        : object_id(0), shader_type( shader_type )
+gl_shader::gl_shader( uint32 sh_type, const string& shader_code )
+        : shader_type( sh_type ), object_id(0)
 {
         compile( shader_code );
@@ -140 +140 @@
         glGetProgramiv( m_name.get_value(), GL_ACTIVE_ATTRIBUTES, &params );
 
-        for ( int i = 0; i < params; ++i )
+        for ( unsigned i = 0; i < (unsigned)params; ++i )
         {
                 int attr_nlen;
@@ -149 +149 @@
                 glGetActiveAttrib( m_name.get_value(), i, 128, &attr_nlen, &attr_len, &attr_type, name_buffer );
 
-                string name( name_buffer, attr_nlen );
+                string name( name_buffer, size_t(attr_nlen) );
 
                 // skip built-ins
@@ -165 +165 @@
         glGetProgramiv( m_name.get_value(), GL_ACTIVE_UNIFORMS, &params );
 
-        for ( int i = 0; i < params; ++i )
+        for ( unsigned i = 0; i < size_t(params); ++i )
         {
                 int uni_nlen;
@@ -174 +174 @@
                 glGetActiveUniform( m_name.get_value(), i, 128, &uni_nlen, &uni_len, &uni_type, name_buffer );
 
-                string name( name_buffer, uni_nlen );
+                string name( name_buffer, size_t(uni_nlen) );
 
                 // skip built-ins
@@ -206 +206 @@
                         case FLOAT_MATRIX_3 : glUniformMatrix3fv( uloc, 1, GL_FALSE, glm::value_ptr(((uniform< enum_to_type< FLOAT_MATRIX_3 >::type >*)( ubase ))->get_value()) ); break;
                         case FLOAT_MATRIX_4 : glUniformMatrix4fv( uloc, 1, GL_FALSE, glm::value_ptr(((uniform< enum_to_type< FLOAT_MATRIX_4 >::type >*)( ubase ))->get_value()) ); break;
-                        //default     : error?
+                        default : break; // error?
                         }
                         ubase->clean();