ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Some image & texture formats are available only through ES2 extensions. 

And ES3 has no extensions now.
pull/278/head
Vladimír Vondruš 13 years ago
parent
787e01940f
commit
6b59c08c15
5 changed files with 43 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      src/AbstractImage.cpp
  2. 8
      src/AbstractImage.h
  3. 2
      src/AbstractTexture.cpp
  4. 8
      src/AbstractTexture.h
  5. 4
      src/Renderbuffer.h

22
src/AbstractImage.cpp
Unescape View File

@ -59,9 +59,13 @@ std::size_t AbstractImage::pixelSize(Format format, Type type) {
case Type::UnsignedShort565Rev: case Type::UnsignedShort565Rev:
#endif #endif
case Type::UnsignedShort4444: case Type::UnsignedShort4444:
#ifndef MAGNUM_TARGET_GLES3
case Type::UnsignedShort4444Rev: case Type::UnsignedShort4444Rev:
#endif
case Type::UnsignedShort5551: case Type::UnsignedShort5551:
#ifndef MAGNUM_TARGET_GLES3
case Type::UnsignedShort1555Rev: case Type::UnsignedShort1555Rev:
#endif
return 2; return 2;
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
case Type::UnsignedInt8888: case Type::UnsignedInt8888:
@ -111,7 +115,9 @@ std::size_t AbstractImage::pixelSize(Format format, Type type) {
#ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_GLES2
case Format::RGBAInteger: case Format::RGBAInteger:
#endif #endif
#ifndef MAGNUM_TARGET_GLES3
case Format::BGRA: case Format::BGRA:
#endif
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
case Format::BGRAInteger: case Format::BGRAInteger:
#endif #endif
@ -119,7 +125,9 @@ std::size_t AbstractImage::pixelSize(Format format, Type type) {
/* Handled above */ /* Handled above */
case Format::DepthComponent: case Format::DepthComponent:
#ifndef MAGNUM_TARGET_GLES3
case Format::StencilIndex: case Format::StencilIndex:
#endif
case Format::DepthStencil: case Format::DepthStencil:
CORRADE_INTERNAL_ASSERT(false); CORRADE_INTERNAL_ASSERT(false);
} }
@ -143,19 +151,27 @@ Debug operator<<(Debug debug, AbstractImage::Format value) {
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
_c(BGR) _c(BGR)
#endif #endif
#ifndef MAGNUM_TARGET_GLES3
_c(BGRA) _c(BGRA)
#endif
#ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_GLES2
_c(RedInteger) _c(RedInteger)
#ifndef MAGNUM_TARGET_GLES
_c(GreenInteger) _c(GreenInteger)
_c(BlueInteger) _c(BlueInteger)
#endif
_c(RGInteger) _c(RGInteger)
_c(RGBInteger) _c(RGBInteger)
_c(RGBAInteger) _c(RGBAInteger)
#ifndef MAGNUM_TARGET_GLES
_c(BGRInteger) _c(BGRInteger)
_c(BGRAInteger) _c(BGRAInteger)
#endif #endif
#endif
_c(DepthComponent) _c(DepthComponent)
#ifndef MAGNUM_TARGET_GLES3
_c(StencilIndex) _c(StencilIndex)
#endif
_c(DepthStencil) _c(DepthStencil)
#undef _c #undef _c
} }
@ -180,7 +196,7 @@ Debug operator<<(Debug debug, AbstractImage::Type value) {
#endif #endif
_c(HalfFloat) _c(HalfFloat)
_c(Float) _c(Float)
#ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_GLES
_c(UnsignedByte332) _c(UnsignedByte332)
_c(UnsignedByte233Rev) _c(UnsignedByte233Rev)
#endif #endif
@ -189,9 +205,13 @@ Debug operator<<(Debug debug, AbstractImage::Type value) {
_c(UnsignedShort565Rev) _c(UnsignedShort565Rev)
#endif #endif
_c(UnsignedShort4444) _c(UnsignedShort4444)
#ifndef MAGNUM_TARGET_GLES3
_c(UnsignedShort4444Rev) _c(UnsignedShort4444Rev)
#endif
_c(UnsignedShort5551) _c(UnsignedShort5551)
#ifndef MAGNUM_TARGET_GLES3
_c(UnsignedShort1555Rev) _c(UnsignedShort1555Rev)
#endif
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
_c(UnsignedInt8888) _c(UnsignedInt8888)
_c(UnsignedInt8888Rev) _c(UnsignedInt8888Rev)

8
src/AbstractImage.h
Unescape View File

@ -131,6 +131,7 @@ class MAGNUM_EXPORT AbstractImage {
BGR = GL_BGR, BGR = GL_BGR,
#endif #endif
#ifndef MAGNUM_TARGET_GLES3
/** /**
* Floating-point BGRA. * Floating-point BGRA.
* @requires_es_extension %Extension @es_extension{EXT,read_format_bgra} * @requires_es_extension %Extension @es_extension{EXT,read_format_bgra}
@ -143,6 +144,7 @@ class MAGNUM_EXPORT AbstractImage {
#else #else
BGRA = GL_BGRA_EXT, BGRA = GL_BGRA_EXT,
#endif #endif
#endif
#ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_GLES2
/** /**
@ -230,6 +232,7 @@ class MAGNUM_EXPORT AbstractImage {
*/ */
DepthComponent = GL_DEPTH_COMPONENT, DepthComponent = GL_DEPTH_COMPONENT,
#ifndef MAGNUM_TARGET_GLES3
/** /**
* Stencil index. For framebuffer reading only. * Stencil index. For framebuffer reading only.
* @requires_es_extension %Extension @es_extension2{NV,read_stencil,GL_NV_read_depth_stencil} * @requires_es_extension %Extension @es_extension2{NV,read_stencil,GL_NV_read_depth_stencil}
@ -240,6 +243,7 @@ class MAGNUM_EXPORT AbstractImage {
#else #else
StencilIndex = 0x1901, StencilIndex = 0x1901,
#endif #endif
#endif
/** /**
* Depth and stencil. * Depth and stencil.
@ -369,6 +373,7 @@ class MAGNUM_EXPORT AbstractImage {
*/ */
UnsignedShort4444 = GL_UNSIGNED_SHORT_4_4_4_4, UnsignedShort4444 = GL_UNSIGNED_SHORT_4_4_4_4,
#ifndef MAGNUM_TARGET_GLES3
/** /**
* ABGR, unsigned short, each component 4bit. * ABGR, unsigned short, each component 4bit.
* @requires_es_extension For framebuffer reading only, extension * @requires_es_extension For framebuffer reading only, extension
@ -379,6 +384,7 @@ class MAGNUM_EXPORT AbstractImage {
#else #else
UnsignedShort4444Rev = GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT, UnsignedShort4444Rev = GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT,
#endif #endif
#endif
/** /**
* RGBA, unsigned short, each RGB component 5bit, alpha component * RGBA, unsigned short, each RGB component 5bit, alpha component
@ -387,6 +393,7 @@ class MAGNUM_EXPORT AbstractImage {
*/ */
UnsignedShort5551 = GL_UNSIGNED_SHORT_5_5_5_1, UnsignedShort5551 = GL_UNSIGNED_SHORT_5_5_5_1,
#ifndef MAGNUM_TARGET_GLES3
/** /**
* ABGR, unsigned short, each RGB component 5bit, alpha component * ABGR, unsigned short, each RGB component 5bit, alpha component
* 1bit. * 1bit.
@ -398,6 +405,7 @@ class MAGNUM_EXPORT AbstractImage {
#else #else
UnsignedShort1555Rev = GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT, UnsignedShort1555Rev = GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT,
#endif #endif
#endif
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
/** /**

2
src/AbstractTexture.cpp
Unescape View File

@ -96,6 +96,7 @@ Int AbstractTexture::maxSupportedLayerCount() {
return Context::current()->state()->texture->maxSupportedLayerCount; return Context::current()->state()->texture->maxSupportedLayerCount;
} }
#ifndef MAGNUM_TARGET_GLES3
Float AbstractTexture::maxSupportedAnisotropy() { Float AbstractTexture::maxSupportedAnisotropy() {
GLfloat& value = Context::current()->state()->texture->maxSupportedAnisotropy; GLfloat& value = Context::current()->state()->texture->maxSupportedAnisotropy;
@ -108,6 +109,7 @@ Float AbstractTexture::maxSupportedAnisotropy() {
return value; return value;
} }
#endif
void AbstractTexture::destroy() { void AbstractTexture::destroy() {
/* Moved out */ /* Moved out */

8
src/AbstractTexture.h
Unescape View File

@ -653,6 +653,7 @@ class MAGNUM_EXPORT AbstractTexture {
RGB565 = GL_RGB565, RGB565 = GL_RGB565,
#endif #endif
#ifndef MAGNUM_TARGET_GLES3
/** /**
* RGB, each component normalized unsigned 10bit. * RGB, each component normalized unsigned 10bit.
* @requires_es_extension %Extension @es_extension{OES,required_internalformat} * @requires_es_extension %Extension @es_extension{OES,required_internalformat}
@ -663,6 +664,7 @@ class MAGNUM_EXPORT AbstractTexture {
#else #else
RGB10 = GL_RGB10_EXT, RGB10 = GL_RGB10_EXT,
#endif #endif
#endif
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
/** /**
@ -740,6 +742,7 @@ class MAGNUM_EXPORT AbstractTexture {
RGB9E5 = GL_RGB9_E5, RGB9E5 = GL_RGB9_E5,
#endif #endif
#ifndef MAGNUM_TARGET_GLES3
/** /**
* sRGB, normalized unsigned, size implementation-dependent. * sRGB, normalized unsigned, size implementation-dependent.
* @todo is this allowed in core? * @todo is this allowed in core?
@ -754,6 +757,7 @@ class MAGNUM_EXPORT AbstractTexture {
#else #else
SRGB = GL_SRGB_EXT, SRGB = GL_SRGB_EXT,
#endif #endif
#endif
#ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_GLES2
/** /**
@ -764,6 +768,7 @@ class MAGNUM_EXPORT AbstractTexture {
SRGB8 = GL_SRGB8, SRGB8 = GL_SRGB8,
#endif #endif
#ifndef MAGNUM_TARGET_GLES3
/** /**
* sRGBA, normalized unsigned, size implementation-dependent. * sRGBA, normalized unsigned, size implementation-dependent.
* @todo is this allowed in core? * @todo is this allowed in core?
@ -778,6 +783,7 @@ class MAGNUM_EXPORT AbstractTexture {
#else #else
SRGBAlpha = GL_SRGB_ALPHA_EXT, SRGBAlpha = GL_SRGB_ALPHA_EXT,
#endif #endif
#endif
#ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_GLES2
/** /**
@ -930,6 +936,7 @@ class MAGNUM_EXPORT AbstractTexture {
DepthComponent24 = GL_DEPTH_COMPONENT24_OES, DepthComponent24 = GL_DEPTH_COMPONENT24_OES,
#endif #endif
#ifndef MAGNUM_TARGET_GLES3
/** /**
* Depth component, 32bit. * Depth component, 32bit.
* @requires_es_extension %Extension (@es_extension{OES,required_internalformat}, * @requires_es_extension %Extension (@es_extension{OES,required_internalformat},
@ -941,6 +948,7 @@ class MAGNUM_EXPORT AbstractTexture {
#else #else
DepthComponent32 = GL_DEPTH_COMPONENT32_OES, DepthComponent32 = GL_DEPTH_COMPONENT32_OES,
#endif #endif
#endif
#ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_GLES2
/** /**

4
src/Renderbuffer.h
Unescape View File

@ -436,6 +436,7 @@ class MAGNUM_EXPORT Renderbuffer {
DepthComponent24 = GL_DEPTH_COMPONENT24_OES, DepthComponent24 = GL_DEPTH_COMPONENT24_OES,
#endif #endif
#ifndef MAGNUM_TARGET_GLES3
/** /**
* Depth component, 32bit. * Depth component, 32bit.
* @requires_es_extension %Extension @es_extension{OES,depth32} * @requires_es_extension %Extension @es_extension{OES,depth32}
@ -445,6 +446,7 @@ class MAGNUM_EXPORT Renderbuffer {
#else #else
DepthComponent32 = GL_DEPTH_COMPONENT32_OES, DepthComponent32 = GL_DEPTH_COMPONENT32_OES,
#endif #endif
#endif
#ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_GLES2
/** /**
@ -466,6 +468,7 @@ class MAGNUM_EXPORT Renderbuffer {
StencilIndex = GL_STENCIL_INDEX, StencilIndex = GL_STENCIL_INDEX,
#endif #endif
#ifndef MAGNUM_TARGET_GLES3
/** /**
* 1-bit stencil index. * 1-bit stencil index.
* @requires_es_extension %Extension @es_extension{OES,stencil1} * @requires_es_extension %Extension @es_extension{OES,stencil1}
@ -485,6 +488,7 @@ class MAGNUM_EXPORT Renderbuffer {
#else #else
StencilIndex4 = GL_STENCIL_INDEX4_OES, StencilIndex4 = GL_STENCIL_INDEX4_OES,
#endif #endif
#endif
/** 8-bit stencil index. */ /** 8-bit stencil index. */
StencilIndex8 = GL_STENCIL_INDEX8, StencilIndex8 = GL_STENCIL_INDEX8,

Write Preview
Loading…
Cancel
Save