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

Timestamp:

05/28/13 16:48:29 (12 years ago)

Author:

epyon

Message:

• context bugfixes, force apply state at creation and apply render state
• window creates context
• index buffer
• vertex arrays (simulation of GL 3 functionality)
• bugfixes

File:

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

trunk/src/gl/gl_enum.cc

@@ -186 +186 @@
         switch( type )
         {
+        case BYTE           : return GL_BYTE;
+        case UBYTE          : return GL_UNSIGNED_BYTE;
+        case SHORT          : return GL_SHORT;
+        case USHORT         : return GL_UNSIGNED_SHORT;
+        case INT            : return GL_INT;
+        case UINT               : return GL_UNSIGNED_INT;
         case FLOAT          : return GL_FLOAT;
         case FLOAT_VECTOR_2 : return GL_FLOAT_VEC2;
@@ -193 +199 @@
         case FLOAT_MATRIX_3 : return GL_FLOAT_MAT3;
         case FLOAT_MATRIX_4 : return GL_FLOAT_MAT4;
-        case INT            : return GL_INT;
         case INT_VECTOR_2   : return GL_INT_VEC2;
         case INT_VECTOR_3   : return GL_INT_VEC3;
@@ -205 +210 @@
         switch( gl_enum )
         {
-        case GL_FLOAT      : return FLOAT;
-        case GL_FLOAT_VEC2 : return FLOAT_VECTOR_2;
-        case GL_FLOAT_VEC3 : return FLOAT_VECTOR_3;
-        case GL_FLOAT_VEC4 : return FLOAT_VECTOR_4;
-        case GL_FLOAT_MAT2 : return FLOAT_MATRIX_2;
-        case GL_FLOAT_MAT3 : return FLOAT_MATRIX_3;
-        case GL_FLOAT_MAT4 : return FLOAT_MATRIX_4;
-        case GL_INT        : return INT;
-        case GL_INT_VEC2   : return INT_VECTOR_2;
-        case GL_INT_VEC3   : return INT_VECTOR_3;
-        case GL_INT_VEC4   : return INT_VECTOR_4;
+        case GL_BYTE           : return BYTE;
+        case GL_UNSIGNED_BYTE  : return UBYTE;
+        case GL_SHORT          : return SHORT;
+        case GL_UNSIGNED_SHORT : return USHORT;
+        case GL_INT            : return INT;
+        case GL_UNSIGNED_INT   : return UINT;
+        case GL_FLOAT          : return FLOAT;
+        case GL_FLOAT_VEC2     : return FLOAT_VECTOR_2;
+        case GL_FLOAT_VEC3     : return FLOAT_VECTOR_3;
+        case GL_FLOAT_VEC4     : return FLOAT_VECTOR_4;
+        case GL_FLOAT_MAT2     : return FLOAT_MATRIX_2;
+        case GL_FLOAT_MAT3     : return FLOAT_MATRIX_3;
+        case GL_FLOAT_MAT4     : return FLOAT_MATRIX_4;
+        case GL_INT_VEC2       : return INT_VECTOR_2;
+        case GL_INT_VEC3       : return INT_VECTOR_3;
+        case GL_INT_VEC4       : return INT_VECTOR_4;
         default : return type(0); // TODO: throw!
         }