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

Timestamp:

09/09/14 20:08:33 (11 years ago)

Author:

epyon

Message:

• texture types (1D,2D,Rect,3D,Cube - not all fully supported yet)
• full framebuffer support
• fixes to texture support
• minor fixes

File:

• trunk/src/gl/gl_enum.cc (modified) (4 diffs)

trunk/src/gl/gl_enum.cc

@@ -8 +8 @@
 
 using namespace nv;
+
+unsigned int nv::texture_type_to_enum( texture_type type )
+{
+        switch( type )
+        {
+        case TEXTURE_1D   : return GL_TEXTURE_1D;
+        case TEXTURE_2D   : return GL_TEXTURE_2D;
+        case TEXTURE_RECT : return GL_TEXTURE_RECTANGLE;
+        case TEXTURE_3D   : return GL_TEXTURE_3D;
+        case TEXTURE_CUBE : return GL_TEXTURE_CUBE_MAP;
+        NV_RETURN_COVERED_DEFAULT( 0 );
+        }
+}
 
 unsigned int nv::clear_state_buffers_to_mask( clear_state::buffers_type type )
@@ -167 +180 @@
 }
 
+unsigned int nv::image_format_to_internal_enum( pixel_format format )
+{
+        switch( format )
+        {
+        case RGB  : return GL_RGB8;
+        case RGBA : return GL_RGBA8;
+                NV_RETURN_COVERED_DEFAULT( 0 );
+        }
+}
+
+
 unsigned int nv::sampler_filter_to_enum( sampler::filter filter )
 {
@@ -207 +231 @@
         }
 }
+
+unsigned int nv::framebuffer_slot_to_enum( framebuffer_slot slot )
+{
+        switch( slot )
+        {
+        case READ_FRAMEBUFFER : return GL_READ_FRAMEBUFFER;
+        case DRAW_FRAMEBUFFER : return GL_DRAW_FRAMEBUFFER;
+        case FRAMEBUFFER      : return GL_FRAMEBUFFER;
+        NV_RETURN_COVERED_DEFAULT( 0 );
+        }
+}
+
+
+unsigned int nv::output_slot_to_enum( output_slot slot )
+{
+        switch( slot )
+        {
+        case OUTPUT_0 : return GL_COLOR_ATTACHMENT0;
+        case OUTPUT_1 : return GL_COLOR_ATTACHMENT1;
+        case OUTPUT_2 : return GL_COLOR_ATTACHMENT2;
+        case OUTPUT_3 : return GL_COLOR_ATTACHMENT3;
+        case OUTPUT_4 : return GL_COLOR_ATTACHMENT4;
+        case OUTPUT_5 : return GL_COLOR_ATTACHMENT5;
+        case OUTPUT_6 : return GL_COLOR_ATTACHMENT6;
+        case OUTPUT_7 : return GL_COLOR_ATTACHMENT7;
+        case OUTPUT_NONE  : return 0;
+        case OUTPUT_FRONT : return GL_FRONT;
+        case OUTPUT_BACK  : return GL_BACK;
+                NV_RETURN_COVERED_DEFAULT( 0 );
+        }
+}
+
 
 unsigned int nv::datatype_to_gl_enum( datatype type )
@@ -257 +313 @@
         case GL_INT_VEC4       : return INT_VECTOR_4;
 // TODO: separate types?
-        case GL_SAMPLER_1D         : return INT;
-        case GL_SAMPLER_2D         : return INT;
-        case GL_SAMPLER_3D         : return INT;
-        case GL_SAMPLER_CUBE       : return INT;
-        case GL_SAMPLER_1D_SHADOW  : return INT;        
-        case GL_SAMPLER_2D_SHADOW  : return INT;
+        case GL_SAMPLER_1D             : return INT;
+        case GL_SAMPLER_2D             : return INT;
+        case GL_SAMPLER_3D             : return INT;
+        case GL_SAMPLER_2D_RECT        : return INT;
+        case GL_SAMPLER_2D_RECT_SHADOW : return INT;
+        case GL_SAMPLER_CUBE           : return INT;
+        case GL_SAMPLER_1D_SHADOW      : return INT;    
+        case GL_SAMPLER_2D_SHADOW      : return INT;
 // TODO: implement?
 //      case GL_BOOL