}
}
-PixelComponents pixelformat_from_graphics(Graphics::PixelFormat pf)
+PixelComponents components_from_graphics(Graphics::PixelFormat pf)
{
switch(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)
{
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
- PixelComponents comp = pixelformat_from_graphics(image.get_format());
-#pragma GCC diagnostic pop
+ PixelComponents comp = components_from_graphics(image.get_format());
return make_pixelformat(comp, UNSIGNED_BYTE);
}
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");
- }
-}
-
-bool is_srgb(PixelFormat pf)
-{
- return (pf==SRGB8 || pf==SRGB8_ALPHA8 || pf==SBGR8 || pf==SBGR8_ALPHA8);
-}
-
-unsigned get_pixel_size(PixelFormat pf)
-{
- return get_component_count(pf)*get_type_size(get_component_type(pf));
+ bool normalized = !is_float(type);
+ return static_cast<PixelFormat>(comp | get_type_size(type)<<8 | (type&0x300)<<4 | normalized*0x4000 | srgb*0x8000);
}
void require_pixelformat(PixelFormat pf)
}
}
+GLenum get_gl_components(PixelComponents comp)
+{
+ switch(comp)
+ {
+ case RED: return GL_RED;
+ case RG: return GL_RG;
+ case RGB: return GL_RGB;
+ case RGBA: return GL_RGBA;
+ case DEPTH_COMPONENT: return GL_DEPTH_COMPONENT;
+ case STENCIL_INDEX: return GL_STENCIL_INDEX;
+ default: throw invalid_argument("get_gl_components");
+ }
+}
+
+GLenum get_gl_pixelformat(PixelFormat pf)
+{
+ switch(pf)
+ {
+ case R8: return GL_R8;
+ case R16F: return GL_R16F;
+ case R32F: return GL_R32F;
+ case RG8: return GL_RG8;
+ case RG16F: return GL_RG16F;
+ case RG32F: return GL_RG32F;
+ case RGB8: return GL_RGB8;
+ case RGB16F: return GL_RGB16F;
+ case RGB32F: return GL_RGB32F;
+ case RGBA8: return GL_RGBA8;
+ case RGBA16F: return GL_RGBA16F;
+ case RGBA32F: return GL_RGBA32F;
+ case SRGB8: return GL_SRGB8;
+ case SRGB8_ALPHA8: return GL_SRGB8_ALPHA8;
+ case DEPTH_COMPONENT16: return GL_DEPTH_COMPONENT16;
+ case DEPTH_COMPONENT24: return GL_DEPTH_COMPONENT24;
+ case DEPTH_COMPONENT32: return GL_DEPTH_COMPONENT32;
+ case DEPTH_COMPONENT32F: return GL_DEPTH_COMPONENT32F;
+ case STENCIL_INDEX8: return GL_STENCIL_INDEX8;
+ default: throw invalid_argument("get_gl_pixelformat");
+ }
+}
+
} // namespace GL
} // namespace Msp
projects / libs / gl.git / blobdiff