Changeset 70 for trunk/src

Timestamp:

06/01/13 00:24:07 (12 years ago)

Author:

epyon

Message:

• etype -> datatype
• types clarifications, and datatype_traits

Location:

trunk/src/gl

Files:

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

trunk/src/gl/gl_device.cc

@@ -67 +67 @@
 }
 
-texture2d* gl_device::create_texture2d( ivec2 size, image_format aformat, etype adatatype, sampler asampler, void* data /*= nullptr */ )
+texture2d* gl_device::create_texture2d( ivec2 size, image_format aformat, datatype 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( etype type )
+unsigned int nv::datatype_to_gl_enum( datatype type )
 {
         switch( type )
@@ -213 +213 @@
 }
 
-nv::etype nv::gl_enum_to_type( unsigned int gl_enum )
+nv::datatype nv::gl_enum_to_datatype( unsigned int gl_enum )
 {
         switch( gl_enum )
@@ -233 +233 @@
         case GL_INT_VEC3       : return INT_VECTOR_3;
         case GL_INT_VEC4       : return INT_VECTOR_4;
-        default : return etype(0); // TODO: throw!
-        }
-}
+        default : return datatype(0); // TODO: throw!
+        }
+}

trunk/src/gl/gl_program.cc

@@ -156 +156 @@
                 int attr_loc = glGetAttribLocation( m_name.get_value(), name.c_str() );
 
-                m_attribute_map[ name ] = new attribute( name, attr_loc, gl_enum_to_type( attr_type ), attr_len );
+                m_attribute_map[ name ] = new attribute( name, attr_loc, gl_enum_to_datatype( attr_type ), attr_len );
         }
 }
@@ -180 +180 @@
 
                 int uni_loc = glGetUniformLocation( m_name.get_value(), name.c_str() );
-                etype utype = gl_enum_to_type( uni_type );
+                datatype utype = gl_enum_to_datatype( 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, etype adatatype, sampler asampler, void* data /*= nullptr */ )
+nv::gl_texture2d::gl_texture2d( ivec2 size, image_format aformat, datatype adatatype, sampler asampler, void* data /*= nullptr */ )
         : texture2d( size, aformat, adatatype, asampler ), m_name()
 {
@@ -31 +31 @@
 {
         glBindTexture( GL_TEXTURE_2D, m_name.get_value() );
-        glTexImage2D( GL_TEXTURE_2D, 0, nv::image_format_to_enum(m_format), m_size.x, m_size.y, 0, nv::image_format_to_enum(m_format), nv::type_to_gl_enum(m_datatype), data );
+        glTexImage2D( GL_TEXTURE_2D, 0, nv::image_format_to_enum(m_format), m_size.x, m_size.y, 0, nv::image_format_to_enum(m_format), nv::datatype_to_gl_enum(m_datatype), data );
         glBindTexture( GL_TEXTURE_2D, 0 );
 }

trunk/src/gl/gl_vertex_buffer.cc

@@ -89 +89 @@
                         location, 
                         va->get_components(), 
-                        nv::type_to_gl_enum( va->get_datatype() ),
+                        nv::datatype_to_gl_enum( va->get_datatype() ),
                         GL_FALSE,
                         va->get_stride(),