Changeset 340 for trunk


Ignore:
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
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/nv/interface/image_data.hh

    r319 r340  
    2323        {
    2424                RGB,
    25                 RGBA
     25                RGBA,
     26                RGB32F,
     27                RGBA32F,
     28                RGB16F,
     29                RGBA16F,
    2630        };
    2731       

  • trunk/nv/lib/detail/gl_ext/gl_ext_framebuffer_object_types.inc

    r311 r340  
    1  #define GL_FRAMEBUFFER     0x8D40
    2  #define GL_RENDERBUFFER    0x8D41
    3  #define GL_STENCIL_INDEX1  0x8D46
    4  #define GL_STENCIL_INDEX4  0x8D47
    5  #define GL_STENCIL_INDEX8  0x8D48
    6  #define GL_STENCIL_INDEX16 0x8D49
    7  #define GL_RENDERBUFFER_WIDTH      0x8D42
    8  #define GL_RENDERBUFFER_HEIGHT     0x8D43
    9  #define GL_RENDERBUFFER_INTERNAL_FORMAT    0x8D44
    10  #define GL_RENDERBUFFER_RED_SIZE   0x8D50
    11  #define GL_RENDERBUFFER_GREEN_SIZE 0x8D51
    12  #define GL_RENDERBUFFER_BLUE_SIZE  0x8D52
    13  #define GL_RENDERBUFFER_ALPHA_SIZE 0x8D53
    14  #define GL_RENDERBUFFER_DEPTH_SIZE 0x8D54
    15  #define GL_RENDERBUFFER_STENCIL_SIZE       0x8D55
    16  #define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE    0x8CD0
    17  #define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME    0x8CD1
    18  #define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL  0x8CD2
    19  #define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE  0x8CD3
    20  #define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET     0x8CD4
    21  #define GL_COLOR_ATTACHMENT0 0x8CE0
    22  #define GL_COLOR_ATTACHMENT1 0x8CE1
    23  #define GL_COLOR_ATTACHMENT2 0x8CE2
    24  #define GL_COLOR_ATTACHMENT3 0x8CE3
    25  #define GL_COLOR_ATTACHMENT4 0x8CE4
    26  #define GL_COLOR_ATTACHMENT5 0x8CE5
    27  #define GL_COLOR_ATTACHMENT6 0x8CE6
    28  #define GL_COLOR_ATTACHMENT7 0x8CE7
    29  #define GL_COLOR_ATTACHMENT8 0x8CE8
    30  #define GL_COLOR_ATTACHMENT9 0x8CE9
    31  #define GL_COLOR_ATTACHMENT10       0x8CEA
    32  #define GL_COLOR_ATTACHMENT11       0x8CEB
    33  #define GL_COLOR_ATTACHMENT12       0x8CEC
    34  #define GL_COLOR_ATTACHMENT13       0x8CED
    35  #define GL_COLOR_ATTACHMENT14       0x8CEE
    36  #define GL_COLOR_ATTACHMENT15       0x8CEF
    37  #define GL_DEPTH_ATTACHMENT 0x8D00
    38  #define GL_STENCIL_ATTACHMENT       0x8D20
    39  #define GL_FRAMEBUFFER_COMPLETE  0x8CD5
    40  #define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT     0x8CD6
    41  #define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT     0x8CD7
    42  #define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS     0x8CD9
    43  #define GL_FRAMEBUFFER_INCOMPLETE_FORMATS0x8CDA
    44  #define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER    0x8CDB
    45  #define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER    0x8CDC
    46  #define GL_FRAMEBUFFER_UNSUPPORTED       0x8CDD
    47  #define GL_FRAMEBUFFER_BINDING     0x8CA6
    48  #define GL_RENDERBUFFER_BINDING    0x8CA7
    49  #define GL_MAX_COLOR_ATTACHMENTS   0x8CDF
    50  #define GL_MAX_RENDERBUFFER_SIZE   0x84E8
    51  #define GL_INVALID_FRAMEBUFFER_OPERATION   0x0506
     1#define GL_FRAMEBUFFER     0x8D40
     2#define GL_RENDERBUFFER    0x8D41
     3#define GL_STENCIL_INDEX1  0x8D46
     4#define GL_STENCIL_INDEX4  0x8D47
     5#define GL_STENCIL_INDEX8  0x8D48
     6#define GL_STENCIL_INDEX16 0x8D49
     7#define GL_RENDERBUFFER_WIDTH      0x8D42
     8#define GL_RENDERBUFFER_HEIGHT     0x8D43
     9#define GL_RENDERBUFFER_INTERNAL_FORMAT    0x8D44
     10#define GL_RENDERBUFFER_RED_SIZE   0x8D50
     11#define GL_RENDERBUFFER_GREEN_SIZE 0x8D51
     12#define GL_RENDERBUFFER_BLUE_SIZE  0x8D52
     13#define GL_RENDERBUFFER_ALPHA_SIZE 0x8D53
     14#define GL_RENDERBUFFER_DEPTH_SIZE 0x8D54
     15#define GL_RENDERBUFFER_STENCIL_SIZE       0x8D55
     16#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE    0x8CD0
     17#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME    0x8CD1
     18#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL  0x8CD2
     19#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE  0x8CD3
     20#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET     0x8CD4
     21#define GL_COLOR_ATTACHMENT0 0x8CE0
     22#define GL_COLOR_ATTACHMENT1 0x8CE1
     23#define GL_COLOR_ATTACHMENT2 0x8CE2
     24#define GL_COLOR_ATTACHMENT3 0x8CE3
     25#define GL_COLOR_ATTACHMENT4 0x8CE4
     26#define GL_COLOR_ATTACHMENT5 0x8CE5
     27#define GL_COLOR_ATTACHMENT6 0x8CE6
     28#define GL_COLOR_ATTACHMENT7 0x8CE7
     29#define GL_COLOR_ATTACHMENT8 0x8CE8
     30#define GL_COLOR_ATTACHMENT9 0x8CE9
     31#define GL_COLOR_ATTACHMENT10       0x8CEA
     32#define GL_COLOR_ATTACHMENT11       0x8CEB
     33#define GL_COLOR_ATTACHMENT12       0x8CEC
     34#define GL_COLOR_ATTACHMENT13       0x8CED
     35#define GL_COLOR_ATTACHMENT14       0x8CEE
     36#define GL_COLOR_ATTACHMENT15       0x8CEF
     37#define GL_DEPTH_ATTACHMENT 0x8D00
     38#define GL_STENCIL_ATTACHMENT       0x8D20
     39#define GL_FRAMEBUFFER_COMPLETE  0x8CD5
     40#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT     0x8CD6
     41#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT     0x8CD7
     42#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS     0x8CD9
     43#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS0x8CDA
     44#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER    0x8CDB
     45#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER    0x8CDC
     46#define GL_FRAMEBUFFER_UNSUPPORTED       0x8CDD
     47#define GL_FRAMEBUFFER_BINDING     0x8CA6
     48#define GL_RENDERBUFFER_BINDING    0x8CA7
     49#define GL_MAX_COLOR_ATTACHMENTS   0x8CDF
     50#define GL_MAX_RENDERBUFFER_SIZE   0x84E8
     51#define GL_INVALID_FRAMEBUFFER_OPERATION   0x0506
     52
     53 // This is actually GL_ARB_texture_float
     54#define GL_RGBA32F                      0x8814
     55#define GL_RGB32F                       0x8815
     56#define GL_ALPHA32F                     0x8816
     57#define GL_INTENSITY32F                 0x8817
     58#define GL_LUMINANCE32F                 0x8818
     59#define GL_LUMINANCE_ALPHA32F           0x8819
     60#define GL_RGBA16F                      0x881A
     61#define GL_RGB16F                       0x881B
     62#define GL_ALPHA16F                     0x881C
     63#define GL_INTENSITY16F                 0x881D
     64#define GL_LUMINANCE16F                 0x881E
     65#define GL_LUMINANCE_ALPHA16F           0x881F

  • trunk/src/gl/gl_enum.cc

    r331 r340  
    174174        switch( format )
    175175        {
    176         case RGB  : return GL_RGB;
    177         case RGBA : return GL_RGBA;
     176        case RGB     : return GL_RGB;
     177        case RGBA    : return GL_RGBA;
     178        case RGB32F  : return GL_RGB;
     179        case RGBA32F : return GL_RGBA;
     180        case RGB16F  : return GL_RGB;
     181        case RGBA16F : return GL_RGBA;
    178182        NV_RETURN_COVERED_DEFAULT( 0 );
    179183        }
    … …  
    184188        switch( format )
    185189        {
    186         case RGB  : return GL_RGB8;
    187         case RGBA : return GL_RGBA8;
    188                 NV_RETURN_COVERED_DEFAULT( 0 );
     190        case RGB     : return GL_RGB8;
     191        case RGBA    : return GL_RGBA8;
     192        case RGB32F  : return GL_RGB32F;
     193        case RGBA32F : return GL_RGBA32F;
     194        case RGB16F  : return GL_RGBA16F;
     195        case RGBA16F : return GL_RGBA16F;
     196        NV_RETURN_COVERED_DEFAULT( 0 );
    189197        }
    190198}

  • trunk/src/sdl/sdl_window.cc

    r336 r340  
    2929        SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
    3030        SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
    31         SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
    3231        SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
    3332
    … …  
    6665        NV_LOG( LOG_INFO, "OpenGL Version      : " << glGetString(GL_VERSION) );
    6766        NV_LOG( LOG_INFO, "OpenGL GLSL Version : " << glGetString(GL_SHADING_LANGUAGE_VERSION) );
    68         // SDL_GL_SetSwapInterval(1);
     67        //SDL_GL_SetSwapInterval(0);
    6968
    7069        // TODO: do we really need this?
Note: See TracChangeset for help on using the changeset viewer.