Changeset 472 for trunk/src/gl

Timestamp:

09/28/15 12:44:21 (10 years ago)

Author:

epyon

Message:

• additional uniforms
• R16F and R32F format support
• error fixes (clang)

File:

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

trunk/src/gl/gl_enum.cc

@@ -187 +187 @@
         case BGRA    : return GL_BGRA;
         case RED     : return GL_RED;
+        case R16F    : return GL_RED;
+        case R32F    : return GL_RED;
         case DEPTH16 : return GL_DEPTH_COMPONENT;
         case DEPTH24 : return GL_DEPTH_COMPONENT;
@@ -206 +208 @@
         case BGR     : return GL_RGB8;
         case BGRA    : return GL_RGBA8;
-        case RED     : return 0x8040; // GL_LUMINANCE8; // TODO: change to GL_R8!
+        case RED     : return GL_R8;
+        case R16F    : return GL_R16F;
+        case R32F    : return GL_R32F;
         case DEPTH16 : return GL_DEPTH_COMPONENT16;
         case DEPTH24 : return GL_DEPTH_COMPONENT24;