Changeset 43 for trunk

Timestamp:

05/28/13 14:09:36 (12 years ago)

Author:

epyon

Message:

• texture2d object interface and implementation

Location:

trunk

Files:

• nv/gl/gl_enum.hh (modified) (2 diffs)
• nv/gl/gl_texture2d.hh (added)
• nv/interface/texture2d.hh (added)
• src/gl/gl_enum.cc (modified) (1 diff)
• src/gl/gl_texture2d.cc (added)

trunk/nv/gl/gl_enum.hh

@@ -16 +16 @@
 #include <nv/interface/render_state.hh>
 #include <nv/interface/vertex_buffer.hh>
+#include <nv/interface/texture2d.hh>
 #include <nv/types.hh>
 
@@ -30 +31 @@
         unsigned int stencil_operation_to_enum( stencil_test_face::operation type );
         unsigned int buffer_hint_to_enum( buffer_hint hint );
+        unsigned int texture_format_to_enum( texture2d::format format );
+        unsigned int texture_datatype_to_enum( texture2d::datatype datatype );
+        unsigned int texture_filter_to_enum( texture2d_sampler::filter filter );
+        unsigned int texture_wrap_to_enum( texture2d_sampler::wrap wrap );
 
         unsigned int type_to_gl_enum( type type );

trunk/src/gl/gl_enum.cc

@@ -134 +134 @@
 }
 
+unsigned int nv::texture_format_to_enum( texture2d::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 )
+{
+        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 )
+{
+        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;
+        default : return 0; // TODO: throw!
+        }
+}
+
+
 unsigned int nv::type_to_gl_enum( type type )
 {