Remove support for legacy OpenGL features

[libs/gl.git] / source / pixelformat.cpp

diff --git a/source/pixelformat.cpp b/source/pixelformat.cpp
index 6655c6b22c3b3205e06be0bbe338e643209d2da9..547a6a6970b4d69566b1a5552ca93a6a39c3fb47 100644 (file)
--- a/source/pixelformat.cpp
+++ b/source/pixelformat.cpp
@@ -34,10 +34,6 @@ void operator>>(const LexicalConverter &conv, PixelFormat &fmt)
                fmt = LUMINANCE;
        else if(conv.get()=="LUMINANCE_ALPHA")
                fmt = LUMINANCE_ALPHA;
-       else if(conv.get()=="SLUMINANCE")
-               fmt = SLUMINANCE;
-       else if(conv.get()=="SLUMINANCE_ALPHA")
-               fmt = SLUMINANCE_ALPHA;
        else
                throw lexical_error(format("conversion of '%s' to PixelFormat", conv.get()));
 }
@@ -83,8 +79,6 @@ PixelFormat get_base_pixelformat(PixelFormat pf)
        {
        case SRGB: return RGB;
        case SRGB_ALPHA: return RGBA;
-       case SLUMINANCE: return LUMINANCE;
-       case SLUMINANCE_ALPHA: return LUMINANCE_ALPHA;
        default: return unsized;
        }
 }
@@ -108,9 +102,7 @@ PixelFormat get_unsized_pixelformat(PixelFormat pf)
        case RGBA32F: return RGBA;
        case SRGB8_ALPHA8: return SRGB_ALPHA;
        case LUMINANCE8: return LUMINANCE;
-       case SLUMINANCE8: return SLUMINANCE;
-       case LUMINANCE_ALPHA8: return LUMINANCE_ALPHA;
-       case SLUMINANCE8_ALPHA8: return SLUMINANCE_ALPHA;
+       case LUMINANCE8_ALPHA8: return LUMINANCE_ALPHA;
        case DEPTH_COMPONENT16:
        case DEPTH_COMPONENT24:
        case DEPTH_COMPONENT32:
@@ -138,9 +130,7 @@ PixelFormat get_sized_pixelformat(PixelFormat pf, unsigned size)
                case SRGB: return SRGB8;
                case SRGB_ALPHA: return SRGB8_ALPHA8;
                case LUMINANCE: return LUMINANCE8;
-               case SLUMINANCE: return SLUMINANCE8;
                case LUMINANCE_ALPHA: return LUMINANCE8_ALPHA8;
-               case SLUMINANCE_ALPHA: return SLUMINANCE8_ALPHA8;
                default: throw invalid_argument("get_sized_pixelformat");
                }
        case 2:
@@ -173,6 +163,20 @@ PixelFormat get_sized_pixelformat(PixelFormat pf, unsigned size)
        }
 }
 
+PixelFormat get_default_sized_pixelformat(PixelFormat pf)
+{
+       pf = get_unsized_pixelformat(pf);
+       unsigned size = 1;
+       if(pf==DEPTH_COMPONENT)
+       {
+               if(get_gl_api()==OPENGL_ES2 && !ARB_depth_buffer_float)
+                       size = 2;
+               else
+                       size = 4;
+       }
+       return get_sized_pixelformat(pf, size);
+}
+
 PixelFormat get_srgb_pixelformat(PixelFormat pf)
 {
        switch(pf)
@@ -181,10 +185,6 @@ PixelFormat get_srgb_pixelformat(PixelFormat pf)
        case RGBA: return SRGB_ALPHA;
        case RGB8: return SRGB8;
        case RGBA8: return SRGB8_ALPHA8;
-       case LUMINANCE: return SLUMINANCE;
-       case LUMINANCE8: return SLUMINANCE8;
-       case LUMINANCE_ALPHA: return SLUMINANCE_ALPHA;
-       case LUMINANCE_ALPHA8: return SLUMINANCE8_ALPHA8;
        default: return pf;
        }
 }
@@ -197,11 +197,9 @@ unsigned get_component_count(PixelFormat pf)
        case DEPTH_COMPONENT:
        case RED:
        case LUMINANCE:
-       case SLUMINANCE:
                return 1;
        case RG:
        case LUMINANCE_ALPHA:
-       case SLUMINANCE_ALPHA:
                return 2;
        case RGB:
        case BGR:
@@ -226,8 +224,6 @@ unsigned get_component_size(PixelFormat pf)
        case SRGB8_ALPHA8:
        case LUMINANCE8:
        case LUMINANCE8_ALPHA8:
-       case SLUMINANCE8:
-       case SLUMINANCE8_ALPHA8:
                return 1;
        case R16F:
        case RG16F:
@@ -290,10 +286,6 @@ void require_pixelformat(PixelFormat pf)
        case SRGB8:
        case SRGB_ALPHA:
        case SRGB8_ALPHA8:
-       case SLUMINANCE:
-       case SLUMINANCE8:
-       case SLUMINANCE_ALPHA:
-       case SLUMINANCE8_ALPHA8:
                { static Require _req(EXT_texture_sRGB); }
                break;
        case BGR: