X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpixelformat.h;h=b69ad499c59c6f77ad3ae737e9c257601544996a;hb=9b430dbef4f58a862320ebfcef7d1f8bff28b0dc;hp=7a562cc948408bccf0eaaba9982df73edc7307e7;hpb=e079d5a878e83dc0baffcec66a57659c885cd593;p=libs%2Fgl.git diff --git a/source/pixelformat.h b/source/pixelformat.h index 7a562cc9..b69ad499 100644 --- a/source/pixelformat.h +++ b/source/pixelformat.h @@ -4,6 +4,7 @@ #include #include #include "gl.h" +#include #include #include #include @@ -17,6 +18,9 @@ enum PixelFormat { STENCIL_INDEX = GL_STENCIL_INDEX, DEPTH_COMPONENT = GL_DEPTH_COMPONENT, + DEPTH_COMPONENT16 = GL_DEPTH_COMPONENT16, + DEPTH_COMPONENT24 = GL_DEPTH_COMPONENT24, + DEPTH_COMPONENT32 = GL_DEPTH_COMPONENT32, RGB = GL_RGB, RGBA = GL_RGBA, RGB8 = GL_RGB8, @@ -37,13 +41,16 @@ enum PixelFormat LUMINANCE16F = GL_LUMINANCE16F_ARB, LUMINANCE32F = GL_LUMINANCE32F_ARB, LUMINANCE_ALPHA = GL_LUMINANCE_ALPHA, - LUMINANCE_ALPHA8 = GL_LUMINANCE8_ALPHA8, + LUMINANCE8_ALPHA8 = GL_LUMINANCE8_ALPHA8, LUMINANCE_ALPHA16F = GL_LUMINANCE_ALPHA16F_ARB, LUMINANCE_ALPHA32F = GL_LUMINANCE_ALPHA32F_ARB, SLUMINANCE = GL_SLUMINANCE, SLUMINANCE8 = GL_SLUMINANCE8, SLUMINANCE_ALPHA = GL_SLUMINANCE_ALPHA, - SLUMINANCE8_ALPHA8 = GL_SLUMINANCE8_ALPHA8 + SLUMINANCE8_ALPHA8 = GL_SLUMINANCE8_ALPHA8, + + // Typo, deprecated + LUMINANCE_ALPHA8 = GL_LUMINANCE8_ALPHA8 }; void operator>>(const LexicalConverter &, PixelFormat &); @@ -52,6 +59,7 @@ PixelFormat pixelformat_from_graphics(Graphics::PixelFormat); PixelFormat storage_pixelformat_from_graphics(Graphics::PixelFormat, bool = false); PixelFormat get_base_pixelformat(PixelFormat); +PixelFormat get_sized_pixelformat(PixelFormat); PixelFormat get_srgb_pixelformat(PixelFormat); unsigned get_component_count(PixelFormat); unsigned get_component_size(PixelFormat);