Changeset 406 for trunk/src/gl/gl_context.cc

Timestamp:

06/20/15 00:05:17 (10 years ago)

Author:

epyon

Message:

• code compiles cleanly on maximum warning level

File:

• trunk/src/gl/gl_context.cc (modified) (10 diffs)

trunk/src/gl/gl_context.cc

@@ -91 +91 @@
         // TODO: support GL_READ_FRAMEBUFFER?
         const gl_framebuffer_info* info  = m_framebuffers.get( f );
-        const gl_texture_info*     tinfo = (gl_texture_info*)m_device->get_texture_info( t );
+        const gl_texture_info*     tinfo = static_cast< const gl_texture_info* >( m_device->get_texture_info( t ) );
         if ( info )
         {
@@ -101 +101 @@
                         //              if ( tinfo->size.y == 0 )
                                 //                      glFramebufferTexture1D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0+(unsigned)slot, GL_TEXTURE_1D, tinfo->glid, 0 );
-                        glFramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0+(unsigned)slot, gl_type, tinfo->glid, 0 );
+                        glFramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0+unsigned( slot ), gl_type, tinfo->glid, 0 );
                 }
                 else
                 {
-                        glFramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0+(unsigned)slot, gl_type, 0, 0 );
+                        glFramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0+unsigned( slot ), gl_type, 0, 0 );
                 }
 
@@ -116 +116 @@
         // TODO: support GL_READ_FRAMEBUFFER?
         const gl_framebuffer_info* info  = m_framebuffers.get( f );
-        const gl_texture_info*     tinfo = (gl_texture_info*)m_device->get_texture_info( depth );
+        const gl_texture_info*     tinfo = static_cast< const gl_texture_info* >( m_device->get_texture_info( depth ) );
         if ( info )
         {
@@ -213 +213 @@
 void nv::gl_context::bind( program p )
 {
-        gl_program_info* info = ((gl_device*)m_device)->m_programs.get( p );
+        gl_device* gdevice    = static_cast<gl_device*>( m_device );
+        gl_program_info* info = gdevice->m_programs.get( p );
         if ( info )
         {
                 glUseProgram( info->glid );
-                ((gl_device*)m_device)->update_uniforms( info );
+                gdevice->update_uniforms( info );
         }
 }
@@ -248 +249 @@
                         }
 
-                        glVertexAttribPointer( 
-                                location, 
-                                static_cast<GLint>( vba.components ), 
+                        glVertexAttribPointer(
+                                location,
+                                static_cast<GLint>( vba.components ),
                                 nv::datatype_to_gl_enum( vba.dtype ),
                                 GL_FALSE,
                                 static_cast<GLsizei>( vba.stride ),
-                                (void*)vba.offset
+                                reinterpret_cast<void*>( vba.offset )
                                 );
                 }
@@ -317 +318 @@
 }
 
-void nv::gl_context::update( texture t, void* data )
+void nv::gl_context::update( texture t, const void* data )
 {
         const gl_texture_info* info = static_cast< const gl_texture_info* >( m_device->get_texture_info( t ) );
@@ -327 +328 @@
 
                 glBindTexture( gl_type, info->glid );
-                glTexImage2D( gl_type, 0, (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 );
+                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 );
         }
 }
@@ -338 +339 @@
                 GLenum glenum = buffer_type_to_enum( info->type );
                 glBindBuffer( glenum, info->glid );
-                glBufferSubData( glenum, (GLintptr)offset, (GLsizeiptr)size, data );
+                glBufferSubData( glenum, GLintptr( offset ), GLsizeiptr( size ), data );
         }
 }
@@ -700 +701 @@
 void nv::gl_context::apply_engine_uniforms( program p, const scene_state& s )
 {
-        gl_program_info* info = ((gl_device*)m_device)->m_programs.get( p );
+        gl_program_info* info = static_cast<gl_device*>( m_device )->m_programs.get( p );
         if ( info )
         {
@@ -725 +726 @@
                 if ( slots[i] > OUTPUT_7 ) buffers[i] = 0;
         }
-        glDrawBuffers( (GLsizei)count, buffers );
+        glDrawBuffers( GLsizei( count ), buffers );
 }