Changeset 49 for trunk/src/gl/gl_enum.cc

Timestamp:

05/28/13 22:19:58 (12 years ago)

Author:

epyon

Message:

• renamings for easier typing

File:

• trunk/src/gl/gl_enum.cc (modified) (1 diff)

trunk/src/gl/gl_enum.cc

@@ -134 +134 @@
 }
 
-unsigned int nv::texture_format_to_enum( texture2d::format format )
+unsigned int nv::image_format_to_enum( image_format format )
 {
         switch( format )
         {
-        case texture2d::RGB  : return GL_RGB;
-        case texture2d::RGBA : return GL_RGBA;
-        default : return 0; // TODO: throw!
-        }
-}
-
-unsigned int nv::texture_datatype_to_enum( texture2d::datatype datatype )
-{
-        switch( datatype )
-        {
-        case texture2d::UINT   : return GL_UNSIGNED_INT;
-        case texture2d::UBYTE  : return GL_UNSIGNED_BYTE;
-        case texture2d::FLOAT  : return GL_FLOAT;
-        default : return 0; // TODO: throw!
-        }
-}
-
-unsigned int nv::texture_filter_to_enum( texture2d_sampler::filter filter )
+        case RGB  : return GL_RGB;
+        case RGBA : return GL_RGBA;
+        default : return 0; // TODO: throw!
+        }
+}
+
+unsigned int nv::sampler_filter_to_enum( sampler::filter filter )
 {
         switch( filter )
         {
-        case texture2d_sampler::LINEAR                 : return GL_LINEAR;
-        case texture2d_sampler::NEAREST                : return GL_NEAREST;
-        case texture2d_sampler::NEAREST_MIPMAP_NEAREST : return GL_NEAREST_MIPMAP_NEAREST;
-        case texture2d_sampler::LINEAR_MIPMAP_NEAREST  : return GL_LINEAR_MIPMAP_NEAREST;
-        case texture2d_sampler::NEAREST_MIPMAP_LINEAR  : return GL_NEAREST_MIPMAP_LINEAR;
-        case texture2d_sampler::LINEAR_MIPMAP_LINEAR   : return GL_LINEAR_MIPMAP_LINEAR;
-        default : return 0; // TODO: throw!
-        }
-}
-
-unsigned int nv::texture_wrap_to_enum( texture2d_sampler::wrap wrap )
+        case sampler::LINEAR                 : return GL_LINEAR;
+        case sampler::NEAREST                : return GL_NEAREST;
+        case sampler::NEAREST_MIPMAP_NEAREST : return GL_NEAREST_MIPMAP_NEAREST;
+        case sampler::LINEAR_MIPMAP_NEAREST  : return GL_LINEAR_MIPMAP_NEAREST;
+        case sampler::NEAREST_MIPMAP_LINEAR  : return GL_NEAREST_MIPMAP_LINEAR;
+        case sampler::LINEAR_MIPMAP_LINEAR   : return GL_LINEAR_MIPMAP_LINEAR;
+        default : return 0; // TODO: throw!
+        }
+}
+
+unsigned int nv::sampler_wrap_to_enum( sampler::wrap wrap )
 {
         switch( wrap )
         {
-        case texture2d_sampler::CLAMP_TO_EDGE   : return GL_CLAMP_TO_EDGE;
-        case texture2d_sampler::CLAMP_TO_BORDER : return GL_CLAMP_TO_BORDER;
-        case texture2d_sampler::MIRRORED_REPEAT : return GL_MIRRORED_REPEAT;
-        case texture2d_sampler::REPEAT          : return GL_REPEAT;
+        case sampler::CLAMP_TO_EDGE   : return GL_CLAMP_TO_EDGE;
+        case sampler::CLAMP_TO_BORDER : return GL_CLAMP_TO_BORDER;
+        case sampler::MIRRORED_REPEAT : return GL_MIRRORED_REPEAT;
+        case sampler::REPEAT          : return GL_REPEAT;
         default : return 0; // TODO: throw!
         }