}
}
-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)
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 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;
}
}
case RGBA16F:
case LUMINANCE16F:
case LUMINANCE_ALPHA16F:
+ case DEPTH_COMPONENT16:
return 2;
+ case DEPTH_COMPONENT24:
+ return 3;
case RGB32F:
case RGBA32F:
case LUMINANCE32F:
case LUMINANCE_ALPHA32F:
+ case DEPTH_COMPONENT32:
return 4;
default:
return 1;
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;
}