Changeset 340 for trunk/src

Timestamp:

09/25/14 00:15:32 (11 years ago)

Author:

epyon

Message:

• new image types for gl (floating point texture support)
• implicitly using GL_ARB_texture_float

Location:

trunk/src

Files:

• gl/gl_enum.cc (modified) (2 diffs)
• sdl/sdl_window.cc (modified) (2 diffs)

trunk/src/gl/gl_enum.cc

@@ -174 +174 @@
         switch( format )
         {
-        case RGB  : return GL_RGB;
-        case RGBA : return GL_RGBA;
+        case RGB     : return GL_RGB;
+        case RGBA    : return GL_RGBA;
+        case RGB32F  : return GL_RGB;
+        case RGBA32F : return GL_RGBA;
+        case RGB16F  : return GL_RGB;
+        case RGBA16F : return GL_RGBA;
         NV_RETURN_COVERED_DEFAULT( 0 );
         }
@@ -184 +188 @@
         switch( format )
         {
-        case RGB  : return GL_RGB8;
-        case RGBA : return GL_RGBA8;
-                NV_RETURN_COVERED_DEFAULT( 0 );
+        case RGB     : return GL_RGB8;
+        case RGBA    : return GL_RGBA8;
+        case RGB32F  : return GL_RGB32F;
+        case RGBA32F : return GL_RGBA32F;
+        case RGB16F  : return GL_RGBA16F;
+        case RGBA16F : return GL_RGBA16F;
+        NV_RETURN_COVERED_DEFAULT( 0 );
         }
 }

trunk/src/sdl/sdl_window.cc

@@ -29 +29 @@
         SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
         SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
-        SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
         SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
 
@@ -66 +65 @@
         NV_LOG( LOG_INFO, "OpenGL Version      : " << glGetString(GL_VERSION) );
         NV_LOG( LOG_INFO, "OpenGL GLSL Version : " << glGetString(GL_SHADING_LANGUAGE_VERSION) );
-        // SDL_GL_SetSwapInterval(1);
+        //SDL_GL_SetSwapInterval(0);
 
         // TODO: do we really need this?