Support sRGB pixelformats through GL_EXT_texture_sRGB

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

diff --git a/source/pixelformat.cpp b/source/pixelformat.cpp
index 4b3dade14e4a9eef0b1052d4764c8e0c4c2b8a51..027ae88c7fe1bb7c5e11290ef5133e3c143b8d05 100644 (file)
--- a/source/pixelformat.cpp
+++ b/source/pixelformat.cpp
@@ -1,6 +1,6 @@
+#include <msp/gl/extensions/arb_texture_float.h>
+#include <msp/gl/extensions/ext_bgra.h>
 #include <msp/strings/format.h>
-#include "arb_texture_float.h"
-#include "ext_bgra.h"
 #include "pixelformat.h"
 
 using namespace std;
@@ -32,10 +32,18 @@ void operator>>(const LexicalConverter &conv, PixelFormat &fmt)
                fmt = BGR;
        else if(conv.get()=="BGRA")
                fmt = BGRA;
+       else if(conv.get()=="SRGB")
+               fmt = SRGB;
+       else if(conv.get()=="SRGB_ALPHA")
+               fmt = SRGB_ALPHA;
        else if(conv.get()=="LUMINANCE")
                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()));
 }
@@ -48,33 +56,82 @@ PixelFormat pixelformat_from_graphics(Graphics::PixelFormat pf)
        case Graphics::LUMINANCE: return LUMINANCE;
        case Graphics::LUMINANCE_ALPHA: return LUMINANCE_ALPHA;
        case Graphics::RGB: return RGB;
+       case Graphics::RGBX:
        case Graphics::RGBA: return RGBA;
        case Graphics::BGR: return BGR;
+       case Graphics::BGRX:
        case Graphics::BGRA: return BGRA;
        default: throw invalid_argument("pixelformat_from_graphics");
        }
 }
 
+PixelFormat storage_pixelformat_from_graphics(Graphics::PixelFormat pf)
+{
+       switch(pf)
+       {
+       case Graphics::RGBX:
+       case Graphics::BGR:
+       case Graphics::BGRX: return RGB;
+       case Graphics::BGRA: return RGBA;
+       default: return pixelformat_from_graphics(pf);
+       }
+}
+
 PixelFormat get_base_pixelformat(PixelFormat pf)
 {
        switch(pf)
        {
        case RGB8:
        case RGB16F:
-       case RGB32F: return RGB;
+       case RGB32F:
+       case SRGB:
+       case SRGB8: return RGB;
        case RGBA8:
        case RGBA16F:
-       case RGBA32F: return RGBA;
+       case RGBA32F:
+       case SRGB_ALPHA:
+       case SRGB8_ALPHA8: return RGBA;
        case LUMINANCE8:
        case LUMINANCE16F:
-       case LUMINANCE32F: return LUMINANCE;
+       case LUMINANCE32F:
+       case SLUMINANCE:
+       case SLUMINANCE8: return LUMINANCE;
        case LUMINANCE_ALPHA8:
        case LUMINANCE_ALPHA16F:
-       case LUMINANCE_ALPHA32F: return LUMINANCE_ALPHA;
+       case LUMINANCE_ALPHA32F:
+       case SLUMINANCE_ALPHA:
+       case SLUMINANCE8_ALPHA8: return LUMINANCE_ALPHA;
        default: return pf;
        }
 }
 
+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;
+       case LUMINANCE_ALPHA:
+       case SLUMINANCE_ALPHA:
+               return 2;
+       case RGB:
+       case BGR:
+               return 3;
+       case RGBA:
+       case BGRA:
+               return 4;
+       default:
+               throw invalid_argument("get_pixelformat_component_count");
+       }
+}
+
 void require_pixelformat(PixelFormat pf)
 {
        switch(pf)
@@ -89,6 +146,16 @@ void require_pixelformat(PixelFormat pf)
        case LUMINANCE_ALPHA32F:
                { static Require _req(ARB_texture_float); }
                break;
+       case SRGB:
+       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:
        case BGRA:
                { static Require _req(EXT_bgra); }