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

Timestamp:

04/29/16 12:42:28 (9 years ago)

Author:

epyon

Message:

• mass update (will try to do atomic from now)

File:

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

trunk/src/gl/gl_enum.cc

@@ -15 +15 @@
         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;
-        case TEXTURE_1D_ARRAY: return GL_TEXTURE_1D_ARRAY;
-        case TEXTURE_2D_ARRAY: return GL_TEXTURE_2D_ARRAY;
+        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;
+        case TEXTURE_1D_ARRAY : return GL_TEXTURE_1D_ARRAY;
+        case TEXTURE_2D_ARRAY : return GL_TEXTURE_2D_ARRAY;
+        case TEXTURE_1D_BUFFER: return GL_TEXTURE_BUFFER;
         NV_RETURN_COVERED_DEFAULT( 0 );
         }
@@ -171 +172 @@
         case INDEX_BUFFER   : return GL_ELEMENT_ARRAY_BUFFER;
         case UNIFORM_BUFFER : return GL_UNIFORM_BUFFER;
+        case TEXTURE_BUFFER : return GL_TEXTURE_BUFFER;
                 NV_RETURN_COVERED_DEFAULT( 0 );
         }
@@ -193 +195 @@
         case DEPTH24 : return GL_DEPTH_COMPONENT;
         case DEPTH32 : return GL_DEPTH_COMPONENT;
+        case R8I     : return GL_RED_INTEGER;
+        case R8UI    : return GL_RED_INTEGER;
+        case R16I    : return GL_RED_INTEGER;
+        case R16UI   : return GL_RED_INTEGER;
+        case R32I    : return GL_RED_INTEGER;
+        case R32UI   : return GL_RED_INTEGER;
         NV_RETURN_COVERED_DEFAULT( 0 );
         }
@@ -215 +223 @@
         case DEPTH24 : return GL_DEPTH_COMPONENT24;
         case DEPTH32:  return GL_DEPTH_COMPONENT32;
+        case R8I     : return GL_R8I;
+        case R8UI    : return GL_R8UI;
+        case R16I    : return GL_R16I;
+        case R16UI   : return GL_R16UI;
+        case R32I    : return GL_R32I;
+        case R32UI   : return GL_R32UI;
         NV_RETURN_COVERED_DEFAULT( 0 );
         }
@@ -358 +372 @@
         case GL_SAMPLER_1D_ARRAY_SHADOW: return INT;
         case GL_SAMPLER_2D_ARRAY_SHADOW: return INT;
+        case GL_SAMPLER_BUFFER         : return INT;
+
+        case GL_INT_SAMPLER_1D                : return INT;
+        case GL_INT_SAMPLER_2D                : return INT;
+        case GL_INT_SAMPLER_3D                : return INT;
+        case GL_INT_SAMPLER_2D_RECT           : return INT;
+        case GL_INT_SAMPLER_CUBE              : return INT;
+        case GL_INT_SAMPLER_1D_ARRAY          : return INT;
+        case GL_INT_SAMPLER_2D_ARRAY          : return INT;
+        case GL_INT_SAMPLER_BUFFER            : return INT;
+        case GL_UNSIGNED_INT_SAMPLER_1D       : return INT;
+        case GL_UNSIGNED_INT_SAMPLER_2D       : return INT;
+        case GL_UNSIGNED_INT_SAMPLER_3D       : return INT;
+        case GL_UNSIGNED_INT_SAMPLER_2D_RECT  : return INT;
+        case GL_UNSIGNED_INT_SAMPLER_CUBE     : return INT;
+        case GL_UNSIGNED_INT_SAMPLER_1D_ARRAY : return INT;
+        case GL_UNSIGNED_INT_SAMPLER_2D_ARRAY : return INT;
+        case GL_UNSIGNED_INT_SAMPLER_BUFFER   : return INT;
                 // TODO: implement?
 //      case GL_BOOL