X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fpixelformat.cpp;h=81379ef07062831a85fed2ee8fa1f925f34b450a;hp=8cc7c9c9d8f2e13fa0d9d05f4de57128a8233491;hb=959efbf61663efd7879070ce0447e02c8a447ce0;hpb=a47639620c40397939ae4d79c08d5d8f460bad5c diff --git a/source/core/pixelformat.cpp b/source/core/pixelformat.cpp index 8cc7c9c9..81379ef0 100644 --- a/source/core/pixelformat.cpp +++ b/source/core/pixelformat.cpp @@ -1,5 +1,3 @@ -#include -#include #include #include "pixelformat.h" @@ -81,22 +79,10 @@ void operator>>(const LexicalConverter &conv, PixelFormat &fmt) else if(conv.get()=="DEPTH_COMPONENT32F") fmt = DEPTH_COMPONENT32F; else - { - if(conv.get()=="SRGB") - fmt = SRGB8; - else if(conv.get()=="SRGB_ALPHA") - fmt = SRGB8_ALPHA8; - else - { - PixelComponents comp; - conv >> comp; - fmt = make_pixelformat(comp, (comp==DEPTH_COMPONENT ? FLOAT : UNSIGNED_BYTE)); - } - IO::print(IO::cerr, "Warning: deprecated conversion of '%s' to PixelFormat\n", conv.get()); - } + throw lexical_error(format("conversion of '%s' to PixelFormat", conv.get())); } -PixelComponents pixelformat_from_graphics(Graphics::PixelFormat pf) +PixelComponents components_from_graphics(Graphics::PixelFormat pf) { switch(pf) { @@ -112,284 +98,16 @@ PixelComponents pixelformat_from_graphics(Graphics::PixelFormat pf) } } -PixelComponents storage_pixelformat_from_graphics(Graphics::PixelFormat pf) -{ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - switch(pf) - { - case Graphics::RGBX: - case Graphics::BGR: - case Graphics::BGRX: return RGB; - case Graphics::BGRA: return RGBA; - default: return pixelformat_from_graphics(pf); - } -#pragma GCC diagnostic pop -} - -PixelFormat pixelformat_from_image(const Graphics::Image &image) +PixelFormat pixelformat_from_image(const Graphics::Image &image, bool srgb) { -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - PixelComponents comp = pixelformat_from_graphics(image.get_format()); -#pragma GCC diagnostic pop - return make_pixelformat(comp, UNSIGNED_BYTE); + PixelComponents comp = components_from_graphics(image.get_format()); + return make_pixelformat(comp, UNSIGNED_BYTE, srgb); } PixelFormat make_pixelformat(PixelComponents comp, DataType type, bool srgb) { - if(srgb && type!=UNSIGNED_BYTE && comp!=RGB && comp!=RGBA && comp!=BGR && comp!=BGRA) - throw invalid_argument("make_pixelformat"); - - switch(comp) - { - case RED: - switch(type) - { - case UNSIGNED_BYTE: return R8; - case HALF_FLOAT: return R16F; - case FLOAT: return R32F; - default: throw invalid_argument("make_pixelformat"); - } - case RG: - switch(type) - { - case UNSIGNED_BYTE: return RG8; - case HALF_FLOAT: return RG16F; - case FLOAT: return RG32F; - default: throw invalid_argument("make_pixelformat"); - } - case RGB: - switch(type) - { - case UNSIGNED_BYTE: return (srgb ? SRGB8 : RGB8); - case HALF_FLOAT: return RGB16F; - case FLOAT: return RGB32F; - default: throw invalid_argument("make_pixelformat"); - } - case RGBA: - switch(type) - { - case UNSIGNED_BYTE: return (srgb ? SRGB8_ALPHA8 : RGBA8); - case HALF_FLOAT: return RGBA16F; - case FLOAT: return RGBA32F; - default: throw invalid_argument("make_pixelformat"); - } - case BGR: - if(type!=UNSIGNED_BYTE) - throw invalid_argument("make_pixelformat"); - return (srgb ? BGR8 : SBGR8); - case BGRA: - if(type!=UNSIGNED_BYTE) - throw invalid_argument("make_pixelformat"); - return (srgb ? BGRA8 : SBGR8_ALPHA8); - case LUMINANCE: - if(type!=UNSIGNED_BYTE) - throw invalid_argument("make_pixelformat"); - return LUMINANCE8; - case LUMINANCE_ALPHA: - if(type!=UNSIGNED_BYTE) - throw invalid_argument("make_pixelformat"); - return LUMINANCE8; - case STENCIL_INDEX: - if(type!=UNSIGNED_BYTE) - throw invalid_argument("make_pixelformat"); - return STENCIL_INDEX8; - case DEPTH_COMPONENT: - switch(type) - { - case UNSIGNED_SHORT: return DEPTH_COMPONENT16; - case UNSIGNED_INT: return DEPTH_COMPONENT32; - case FLOAT: return DEPTH_COMPONENT32F; - default: throw invalid_argument("make_pixelformat"); - } - default: - throw invalid_argument("make_pixelformat"); - } -} - -PixelFormat get_base_pixelformat(PixelFormat pf) -{ - switch(pf) - { - case SRGB8: return RGB8; - case SRGB8_ALPHA8: return RGBA8; - default: return pf; - } -} - -PixelComponents get_components(PixelFormat pf) -{ - switch(pf) - { - case R8: - case R16F: - case R32F: return RED; - case RG8: - case RG16F: - case RG32F: return RG; - case RGB8: - case RGB16F: - case RGB32F: - case SRGB8: return RGB; - case RGBA8: - case RGBA16F: - case RGBA32F: - case SRGB8_ALPHA8: return RGBA; - case BGR8: - case SBGR8: return BGR; - case BGRA8: - case SBGR8_ALPHA8: return BGRA; - case LUMINANCE8: return LUMINANCE; - case LUMINANCE8_ALPHA8: return LUMINANCE_ALPHA; - case STENCIL_INDEX8: return STENCIL_INDEX; - case DEPTH_COMPONENT16: - case DEPTH_COMPONENT24: - case DEPTH_COMPONENT32: - case DEPTH_COMPONENT32F: return DEPTH_COMPONENT; - default: throw invalid_argument("get_components"); - } -} - -PixelFormat get_default_sized_pixelformat(PixelComponents comp) -{ - DataType type = UNSIGNED_BYTE; - if(comp==DEPTH_COMPONENT) - { - if(get_gl_api()==OPENGL_ES2 && !ARB_depth_buffer_float) - type = UNSIGNED_SHORT; - else - type = FLOAT; - } - return make_pixelformat(comp, type); -} - -PixelFormat get_srgb_pixelformat(PixelFormat pf) -{ - switch(pf) - { - case RGB8: return SRGB8; - case RGBA8: return SRGB8_ALPHA8; - default: return pf; - } -} - -unsigned get_component_count(PixelComponents comp) -{ - switch(comp) - { - case RED: - case LUMINANCE: - case DEPTH_COMPONENT: - case STENCIL_INDEX: - return 1; - case RG: - case LUMINANCE_ALPHA: - return 2; - case RGB: - case BGR: - return 3; - case RGBA: - case BGRA: - return 4; - default: - throw invalid_argument("get_component_count"); - } -} - -DataType get_component_type(PixelFormat pf) -{ - switch(pf) - { - case R8: - case RG8: - case RGB8: - case RGBA8: - case SRGB8: - case SRGB8_ALPHA8: - case BGR8: - case BGRA8: - case SBGR8: - case SBGR8_ALPHA8: - case LUMINANCE8: - case LUMINANCE8_ALPHA8: - return UNSIGNED_BYTE; - case R16F: - case RG16F: - case RGB16F: - case RGBA16F: - return HALF_FLOAT; - case DEPTH_COMPONENT16: - return UNSIGNED_SHORT; - case R32F: - case RG32F: - case RGB32F: - case RGBA32F: - case DEPTH_COMPONENT32: - return UNSIGNED_INT; - case DEPTH_COMPONENT32F: - return FLOAT; - case DEPTH_COMPONENT24: - // There's no DataType value with 24-bit size - default: - throw invalid_argument("get_component_type"); - } -} - -unsigned get_pixel_size(PixelFormat pf) -{ - return get_component_count(pf)*get_type_size(get_component_type(pf)); -} - -void require_pixelformat(PixelFormat pf) -{ - /* TODO These checks are only accurate for textures. On OpenGL ES some - formats are allowed for render buffers earlier than textures. In particular - it's possible to create a 16-bit depth renderbuffer on OpenGL ES 2.0 but - depth textures are only available with 3.0 or the OES_depth_texture - extension.*/ - switch(pf) - { - case RGB8: - case RGBA8: - { static Require _req(OES_required_internalformat); } - break; - case R8: - case RG8: - { static Require _req(ARB_texture_rg); } - break; - case R16F: - case R32F: - case RG16F: - case RG32F: - { static Require _req(ARB_texture_rg); } - { static Require _req(ARB_texture_float); } - break; - case RGB16F: - case RGB32F: - case RGBA16F: - case RGBA32F: - { static Require _req(ARB_texture_float); } - break; - case SRGB8: - case SRGB8_ALPHA8: - { static Require _req(EXT_texture_sRGB); } - break; - case DEPTH_COMPONENT16: - case DEPTH_COMPONENT24: - case DEPTH_COMPONENT32: - { static Require _req(ARB_depth_texture); } - { static Require _req(OES_required_internalformat); } - break; - case DEPTH_COMPONENT32F: - { static Require _req(ARB_depth_buffer_float); } - break; - case STENCIL_INDEX8: - { static Require _req(OES_texture_stencil8); } - break; - default: - throw invalid_argument("require_pixelformat"); - } + bool normalized = !is_float(type); + return static_cast(comp | get_type_size(type)<<8 | (type&0x300)<<4 | normalized*0x4000 | srgb*0x8000); } } // namespace GL