Changeset 62 for trunk/src

Timestamp:

05/30/13 16:44:38 (12 years ago)

Author:

epyon

Message:

• type -> etype - to reduce confusion for the compiler

Location:

trunk/src/gl

Files:

• gl_device.cc (modified) (1 diff)
• gl_enum.cc (modified) (3 diffs)
• gl_program.cc (modified) (1 diff)
• gl_texture2d.cc (modified) (1 diff)

trunk/src/gl/gl_device.cc

@@ -67 +67 @@
 }
 
-texture2d* gl_device::create_texture2d( ivec2 size, image_format aformat, type adatatype, sampler asampler, void* data /*= nullptr */ )
+texture2d* gl_device::create_texture2d( ivec2 size, image_format aformat, etype adatatype, sampler asampler, void* data /*= nullptr */ )
 {
         return new gl_texture2d( size, aformat, adatatype, asampler, data );

trunk/src/gl/gl_enum.cc

@@ -185 +185 @@
 }
 
-unsigned int nv::type_to_gl_enum( type type )
+unsigned int nv::type_to_gl_enum( etype type )
 {
         switch( type )
@@ -209 +209 @@
 }
 
-nv::type nv::gl_enum_to_type( unsigned int gl_enum )
+nv::etype nv::gl_enum_to_type( unsigned int gl_enum )
 {
         switch( gl_enum )
@@ -229 +229 @@
         case GL_INT_VEC3       : return INT_VECTOR_3;
         case GL_INT_VEC4       : return INT_VECTOR_4;
-        default : return type(0); // TODO: throw!
-        }
-}
+        default : return etype(0); // TODO: throw!
+        }
+}

trunk/src/gl/gl_program.cc

@@ -180 +180 @@
 
                 int uni_loc = glGetUniformLocation( m_name.get_value(), name.c_str() );
-                type utype = gl_enum_to_type( uni_type );
+                etype utype = gl_enum_to_type( uni_type );
                 m_uniform_map[ name ] = create_uniform( utype, name, uni_loc, uni_len );
         }

trunk/src/gl/gl_texture2d.cc

@@ -10 +10 @@
 using namespace nv;
 
-nv::gl_texture2d::gl_texture2d( ivec2 size, image_format aformat, type adatatype, sampler asampler, void* data /*= nullptr */ )
+nv::gl_texture2d::gl_texture2d( ivec2 size, image_format aformat, etype adatatype, sampler asampler, void* data /*= nullptr */ )
         : texture2d( size, aformat, adatatype, asampler ), m_name()
 {