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()));
}
{
case SRGB: return RGB;
case SRGB_ALPHA: return RGBA;
- case SLUMINANCE: return LUMINANCE;
- case SLUMINANCE_ALPHA: return LUMINANCE_ALPHA;
default: return unsized;
}
}
case RGBA32F: return RGBA;
case SRGB8_ALPHA8: return SRGB_ALPHA;
case LUMINANCE8: return LUMINANCE;
- case SLUMINANCE8: return SLUMINANCE;
- case LUMINANCE_ALPHA8: return LUMINANCE_ALPHA;
- case SLUMINANCE8_ALPHA8: return SLUMINANCE_ALPHA;
+ case LUMINANCE8_ALPHA8: return LUMINANCE_ALPHA;
case DEPTH_COMPONENT16:
case DEPTH_COMPONENT24:
case DEPTH_COMPONENT32:
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;
default: throw invalid_argument("get_sized_pixelformat");
}
case 2:
case RGBA: return SRGB_ALPHA;
case RGB8: return SRGB8;
case RGBA8: return SRGB8_ALPHA8;
- case LUMINANCE: return SLUMINANCE;
- case LUMINANCE8: return SLUMINANCE8;
- case LUMINANCE_ALPHA: return SLUMINANCE_ALPHA;
- case LUMINANCE_ALPHA8: return SLUMINANCE8_ALPHA8;
default: return pf;
}
}
case DEPTH_COMPONENT:
case RED:
case LUMINANCE:
- case SLUMINANCE:
return 1;
case RG:
case LUMINANCE_ALPHA:
- case SLUMINANCE_ALPHA:
return 2;
case RGB:
case BGR:
case SRGB8_ALPHA8:
case LUMINANCE8:
case LUMINANCE8_ALPHA8:
- case SLUMINANCE8:
- case SLUMINANCE8_ALPHA8:
return 1;
case R16F:
case RG16F:
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: