Remove a number of rarely used legacy features

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

diff --git a/source/pixelformat.cpp b/source/pixelformat.cpp
index b8180b2fb75e559477c0388eddc53509f35263ba..cd3bb2aa78e30709293dd8dfb13f4d42cd4c481d 100644 (file)
--- a/source/pixelformat.cpp
+++ b/source/pixelformat.cpp
@@ -10,20 +10,10 @@ namespace GL {
 
 void operator>>(const LexicalConverter &conv, PixelFormat &fmt)
 {
-       if(conv.get()=="COLOR_INDEX")
-               fmt = COLOR_INDEX;
-       else if(conv.get()=="STENCIL_INDEX")
+       if(conv.get()=="STENCIL_INDEX")
                fmt = STENCIL_INDEX;
        else if(conv.get()=="DEPTH_COMPONENT")
                fmt = DEPTH_COMPONENT;
-       else if(conv.get()=="RED")
-               fmt = RED;
-       else if(conv.get()=="GREEN")
-               fmt = GREEN;
-       else if(conv.get()=="BLUE")
-               fmt = BLUE;
-       else if(conv.get()=="ALPHA")
-               fmt = ALPHA;
        else if(conv.get()=="RGB")
                fmt = RGB;
        else if(conv.get()=="RGBA")
@@ -52,7 +42,6 @@ PixelFormat pixelformat_from_graphics(Graphics::PixelFormat pf)
 {
        switch(pf)
        {
-       case Graphics::COLOR_INDEX: return COLOR_INDEX;
        case Graphics::LUMINANCE: return LUMINANCE;
        case Graphics::LUMINANCE_ALPHA: return LUMINANCE_ALPHA;
        case Graphics::RGB: return RGB;
@@ -125,12 +114,8 @@ unsigned get_component_count(PixelFormat pf)
 {
        switch(get_base_pixelformat(pf))
        {
-       case COLOR_INDEX:
        case STENCIL_INDEX:
        case DEPTH_COMPONENT:
-       case RED:
-       case GREEN:
-       case BLUE:
        case LUMINANCE:
        case SLUMINANCE:
                return 1;
@@ -144,10 +129,34 @@ unsigned get_component_count(PixelFormat pf)
        case BGRA:
                return 4;
        default:
-               throw invalid_argument("get_pixelformat_component_count");
+               throw invalid_argument("get_component_count");
        }
 }
 
+unsigned get_component_size(PixelFormat pf)
+{
+       switch(pf)
+       {
+       case RGB16F:
+       case RGBA16F:
+       case LUMINANCE16F:
+       case LUMINANCE_ALPHA16F:
+               return 2;
+       case RGB32F:
+       case RGBA32F:
+       case LUMINANCE32F:
+       case LUMINANCE_ALPHA32F:
+               return 4;
+       default:
+               return 1;
+       }
+}
+
+unsigned get_pixel_size(PixelFormat pf)
+{
+       return get_component_count(pf)*get_component_size(pf);
+}
+
 void require_pixelformat(PixelFormat pf)
 {
        switch(pf)