Changeset 2315


Ignore:
Timestamp:
Feb 2, 2013, 2:07:10 AM (7 years ago)
Author:
sam
Message:

gpu: OpenGL ES compilation fix: GL_RGB8 is desktop OpenGL only.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/gpu/texture.cpp

    r2313 r2315  
    128128    {
    129129        { 0, 0, 0, 0 }, /* Unknown */
    130         { GL_RGB8, GL_RGB, GL_UNSIGNED_BYTE, 3 }, /* RGB_8 */
    131130
    132131#if __CELLOS_LV2__
     132        { GL_RGB8, GL_RGB, GL_UNSIGNED_BYTE, 3 },
    133133        { GL_ARGB_SCE, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, 4 },
    134134        { GL_ARGB_SCE, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8, 4 },
    135135        { GL_LUMINANCE8, GL_LUMINANCE, GL_UNSIGNED_BYTE, 1 },
    136136#elif defined __native_client__ || defined HAVE_GLES_2X
     137        { GL_RGB, GL_RGB, GL_UNSIGNED_BYTE, 3 },
    137138        { GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE, 4 },
    138139        /* FIXME: if GL_RGBA is not available, we should advertise
     
    141142        { GL_LUMINANCE, GL_LUMINANCE, GL_UNSIGNED_BYTE, 1 },
    142143#else
     144        { GL_RGB8, GL_RGB, GL_UNSIGNED_BYTE, 3 }, /* RGB_8 */
    143145        /* Seems efficient for little endian textures */
    144146        { GL_RGBA8, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, 4 }, /* ARGB_8 */
Note: See TracChangeset for help on using the changeset viewer.