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()=="RG")
+ fmt = RG;
else if(conv.get()=="RGB")
fmt = RGB;
else if(conv.get()=="RGBA")
{
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;
}
}
-PixelFormat storage_pixelformat_from_graphics(Graphics::PixelFormat pf)
+PixelFormat storage_pixelformat_from_graphics(Graphics::PixelFormat pf, bool srgb)
{
+ PixelFormat result;
switch(pf)
{
case Graphics::RGBX:
case Graphics::BGR:
- case Graphics::BGRX: return RGB;
- case Graphics::BGRA: return RGBA;
- default: return pixelformat_from_graphics(pf);
+ case Graphics::BGRX: result = RGB; break;
+ case Graphics::BGRA: result = RGBA; break;
+ default: result = pixelformat_from_graphics(pf);
}
+
+ if(srgb)
+ return get_srgb_pixelformat(result);
+ else
+ return result;
}
PixelFormat get_base_pixelformat(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 SRGB_ALPHA:
case SRGB8_ALPHA8: return RGBA;
case LUMINANCE8:
- case LUMINANCE16F:
- case LUMINANCE32F:
case SLUMINANCE:
case SLUMINANCE8: return LUMINANCE;
case LUMINANCE_ALPHA8:
- case LUMINANCE_ALPHA16F:
- case LUMINANCE_ALPHA32F:
case SLUMINANCE_ALPHA:
case SLUMINANCE8_ALPHA8: return LUMINANCE_ALPHA;
+ case DEPTH_COMPONENT16:
+ case DEPTH_COMPONENT24:
+ case DEPTH_COMPONENT32: return DEPTH_COMPONENT;
+ default: return pf;
+ }
+}
+
+PixelFormat get_sized_pixelformat(PixelFormat pf)
+{
+ switch(pf)
+ {
+ case RED: return R8;
+ case RG: return RG8;
+ case RGB: return RGB8;
+ case RGBA: return RGBA8;
+ 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;
+ case DEPTH_COMPONENT:
+ if(get_gl_api()==OPENGL_ES2)
+ return DEPTH_COMPONENT16;
+ else
+ return DEPTH_COMPONENT32;
default: return 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 RG:
case LUMINANCE_ALPHA:
case SLUMINANCE_ALPHA:
return 2;
{
switch(pf)
{
+ case R16F:
+ case RG16F:
case RGB16F:
case RGBA16F:
- case LUMINANCE16F:
- case LUMINANCE_ALPHA16F:
+ case DEPTH_COMPONENT16:
return 2;
+ case DEPTH_COMPONENT24:
+ return 3;
+ case R32F:
+ case RG32F:
case RGB32F:
case RGBA32F:
- case LUMINANCE32F:
- case LUMINANCE_ALPHA32F:
+ case DEPTH_COMPONENT32:
return 4;
default:
return 1;
{
switch(pf)
{
+ case RED:
+ case R8:
+ case RG:
+ 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:
- case LUMINANCE16F:
- case LUMINANCE32F:
- case LUMINANCE_ALPHA16F:
- case LUMINANCE_ALPHA32F:
{ static Require _req(ARB_texture_float); }
break;
case SRGB:
case BGRA:
{ static Require _req(EXT_bgra); }
break;
+ case DEPTH_COMPONENT:
+ case DEPTH_COMPONENT16:
+ case DEPTH_COMPONENT24:
+ case DEPTH_COMPONENT32:
+ { static Require _req(ARB_depth_texture); }
+ break;
default:
break;
}