From 9701c8dacb84ac44951f8893a4e4f363d9ba12d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 10 Nov 2012 20:21:52 +0100 Subject: [PATCH 01/18] If targetting exactly ES 2.0, hide everything not available there. Some target platforms supply their own OpenGL headers, thus we cannot use our own from ES 3.0 and compilation fails. On the other hand, this will be better for users as usage of unsupported features will be catched right during compilation and not at runtime. --- src/AbstractShaderProgram.h | 12 ++++++++++-- src/AbstractTexture.cpp | 2 ++ src/AbstractTexture.h | 19 ++++++++++++++++++- src/Buffer.h | 20 ++++++++++++++++++-- src/BufferedImage.cpp | 2 ++ src/BufferedImage.h | 4 ++++ src/Context.cpp | 5 +++++ src/Framebuffer.cpp | 2 ++ src/Framebuffer.h | 11 ++++++++++- src/Implementation/BufferState.cpp | 16 +++++++++++----- src/Implementation/BufferState.h | 4 ++++ src/Renderbuffer.cpp | 2 ++ src/Renderbuffer.h | 24 +++++++++++++++++++++--- 13 files changed, 109 insertions(+), 14 deletions(-) diff --git a/src/AbstractShaderProgram.h b/src/AbstractShaderProgram.h index 0977ab649..504ef9d06 100644 --- a/src/AbstractShaderProgram.h +++ b/src/AbstractShaderProgram.h @@ -361,6 +361,7 @@ class MAGNUM_EXPORT AbstractShaderProgram { /* GL_FIXED not supported */ + #ifndef MAGNUM_TARGET_GLES2 /** * Unsigned 2.10.10.10 packed integer. Only for * four-component float vector attribute type. @@ -377,6 +378,7 @@ class MAGNUM_EXPORT AbstractShaderProgram { * @requires_gles30 (no extension providing this functionality) */ Int2101010REV = GL_INT_2_10_10_10_REV + #endif }; #else typedef typename Implementation::Attribute::DataType DataType; @@ -465,6 +467,7 @@ class MAGNUM_EXPORT AbstractShaderProgram { bool use(); protected: + #ifndef MAGNUM_TARGET_GLES2 /** * @brief Allow retrieving program binary * @@ -478,6 +481,7 @@ class MAGNUM_EXPORT AbstractShaderProgram { inline void setRetrievableBinary(bool enabled) { glProgramParameteri(_id, GL_PROGRAM_BINARY_RETRIEVABLE_HINT, enabled ? GL_TRUE : GL_FALSE); } + #endif /** * @brief Allow the program to be bound to individual pipeline stages @@ -1101,12 +1105,16 @@ template<> struct Attribute> { UnsignedInt = GL_UNSIGNED_INT, Int = GL_INT, Half = GL_HALF_FLOAT, - Float = GL_FLOAT, + Float = GL_FLOAT #ifndef MAGNUM_TARGET_GLES - Double = GL_DOUBLE, + , + Double = GL_DOUBLE #endif + #ifndef MAGNUM_TARGET_GLES2 + , UnsignedAlpha2RGB10 = GL_UNSIGNED_INT_2_10_10_10_REV, Alpha2RGB10 = GL_INT_2_10_10_10_REV + #endif }; enum class DataOption: std::uint8_t { diff --git a/src/AbstractTexture.cpp b/src/AbstractTexture.cpp index 8012626b7..41fb407e6 100644 --- a/src/AbstractTexture.cpp +++ b/src/AbstractTexture.cpp @@ -312,6 +312,7 @@ void AbstractTexture::subImageImplementationDSA(GLenum target, GLint mipLevel, c } #endif +#ifndef MAGNUM_TARGET_GLES2 AbstractTexture::InternalFormat::InternalFormat(AbstractTexture::Components components, AbstractTexture::ComponentType type) { #ifndef MAGNUM_TARGET_GLES #define internalFormatSwitch(c) switch(type) { \ @@ -374,6 +375,7 @@ AbstractTexture::InternalFormat::InternalFormat(AbstractTexture::Components comp internalFormatSwitch(RGBA) #undef internalFormatSwitch } +#endif #ifndef DOXYGEN_GENERATING_OUTPUT void AbstractTexture::DataHelper<2>::setWrapping(AbstractTexture* texture, const Math::Vector2& wrapping) { diff --git a/src/AbstractTexture.h b/src/AbstractTexture.h index 35abf4823..f9581dd02 100644 --- a/src/AbstractTexture.h +++ b/src/AbstractTexture.h @@ -141,6 +141,7 @@ class MAGNUM_EXPORT AbstractTexture { /** @{ @name Internal texture formats */ + #ifndef MAGNUM_TARGET_GLES2 /** * @brief Color components * @@ -253,6 +254,7 @@ class MAGNUM_EXPORT AbstractTexture { NormalizedShort #endif }; + #endif /** * @brief Internal format @@ -261,6 +263,7 @@ class MAGNUM_EXPORT AbstractTexture { * normalization see enums Components and ComponentType. */ enum class Format: GLenum { + #ifndef MAGNUM_TARGET_GLES2 /** * One-component (red channel), unsigned normalized, probably * 8bit. @@ -276,6 +279,7 @@ class MAGNUM_EXPORT AbstractTexture { * @requires_gles30 (no extension providing this functionality) */ RedGreen = GL_RG, + #endif /** * Three-component RGB, unsigned normalized, each component @@ -311,6 +315,7 @@ class MAGNUM_EXPORT AbstractTexture { BGRA = GL_BGRA, #endif + #ifndef MAGNUM_TARGET_GLES2 /** * Four-component sRGBA, unsigned normalized, each component * 8bit, 32bit total. @@ -339,6 +344,7 @@ class MAGNUM_EXPORT AbstractTexture { * @requires_gles30 (no extension providing this functionality) */ RGB10Alpha2Unsigned = GL_RGB10_A2UI, + #endif /** * Four-component RGBA, unsigned normalized, each RGB component @@ -352,6 +358,7 @@ class MAGNUM_EXPORT AbstractTexture { */ RGBA4 = GL_RGBA4, + #ifndef MAGNUM_TARGET_GLES2 /** * Three-component RGB, float, red and green 11bit, blue 10bit, * 32bit total. @@ -359,6 +366,7 @@ class MAGNUM_EXPORT AbstractTexture { * @requires_gles30 (no extension providing this functionality) */ RG11B10Float = GL_R11F_G11F_B10F, + #endif /* 1.5.6 <= GLEW < 1.8.0 doesn't have this, even if there is GL_ARB_ES2_compatibility */ @@ -367,9 +375,11 @@ class MAGNUM_EXPORT AbstractTexture { * Three-component RGB, unsigned normalized, red and blue 5bit, * green 6bit, 16bit total. */ - RGB565 = GL_RGB565, + RGB565 = GL_RGB565 #endif + #ifndef MAGNUM_TARGET_GLES2 + , /** * Three-component RGB, unsigned with exponent, each component * 9bit, exponent 5bit, 32bit total. @@ -377,6 +387,7 @@ class MAGNUM_EXPORT AbstractTexture { * @requires_gles30 (no extension providing this functionality) */ RGB9Exponent5 = GL_RGB9_E5, + #endif #ifndef MAGNUM_TARGET_GLES /** @@ -487,6 +498,7 @@ class MAGNUM_EXPORT AbstractTexture { DepthStencil = GL_DEPTH_STENCIL, #endif + #ifndef MAGNUM_TARGET_GLES2 /** * 16bit depth component. * @requires_gles30 (no extension providing this functionality) @@ -519,6 +531,7 @@ class MAGNUM_EXPORT AbstractTexture { * @requires_gles30 (no extension providing this functionality) */ Depth32FloatStencil8 = GL_DEPTH32F_STENCIL8 + #endif }; /** @@ -539,12 +552,14 @@ class MAGNUM_EXPORT AbstractTexture { */ class MAGNUM_EXPORT InternalFormat { public: + #ifndef MAGNUM_TARGET_GLES2 /** * @brief Constructor from component count and data type per component * * @requires_gles30 (no extension providing this functionality) */ InternalFormat(Components components, ComponentType type); + #endif /** @brief Constructor from named internal format */ inline constexpr InternalFormat(Format format): internalFormat(static_cast(format)) {} @@ -791,6 +806,7 @@ class MAGNUM_EXPORT AbstractTexture { GLuint _id; }; +#ifndef MAGNUM_TARGET_GLES2 /** @relates AbstractTexture @brief Convertor of component count and data type to InternalFormat @@ -806,6 +822,7 @@ inline AbstractTexture::InternalFormat operator|(AbstractTexture::Components com inline AbstractTexture::InternalFormat operator|(AbstractTexture::ComponentType type, AbstractTexture::Components components) { return AbstractTexture::InternalFormat(components, type); } +#endif #ifndef DOXYGEN_GENERATING_OUTPUT #ifndef MAGNUM_TARGET_GLES diff --git a/src/Buffer.h b/src/Buffer.h index 5efa508a2..bf426f2d4 100644 --- a/src/Buffer.h +++ b/src/Buffer.h @@ -105,6 +105,7 @@ class MAGNUM_EXPORT Buffer { AtomicCounter = GL_ATOMIC_COUNTER_BUFFER, #endif + #ifndef MAGNUM_TARGET_GLES2 /** * Source for copies. See copy(). * @requires_gl31 Extension @extension{ARB,copy_buffer} @@ -120,6 +121,7 @@ class MAGNUM_EXPORT Buffer { * 2.0. */ CopyWrite = GL_COPY_WRITE_BUFFER, + #endif #ifndef MAGNUM_TARGET_GLES /** @@ -138,7 +140,10 @@ class MAGNUM_EXPORT Buffer { #endif /** Used for storing vertex indices. */ - ElementArray = GL_ELEMENT_ARRAY_BUFFER, + ElementArray = GL_ELEMENT_ARRAY_BUFFER + + #ifndef MAGNUM_TARGET_GLES2 + , /** * Target for pixel pack operations. @@ -153,6 +158,7 @@ class MAGNUM_EXPORT Buffer { * OpenGL ES 2.0. */ PixelUnpack = GL_PIXEL_UNPACK_BUFFER, + #endif #ifndef MAGNUM_TARGET_GLES /** @@ -170,6 +176,7 @@ class MAGNUM_EXPORT Buffer { Texture = GL_TEXTURE_BUFFER, #endif + #ifndef MAGNUM_TARGET_GLES2 /** * Target for transform feedback. * @requires_gl30 Extension @extension{EXT,transform_feedback} @@ -185,6 +192,7 @@ class MAGNUM_EXPORT Buffer { * 2.0. */ Uniform = GL_UNIFORM_BUFFER + #endif }; /** @@ -198,6 +206,7 @@ class MAGNUM_EXPORT Buffer { */ StreamDraw = GL_STREAM_DRAW, + #ifndef MAGNUM_TARGET_GLES2 /** * Set once as output from an OpenGL command and used infequently * for drawing. @@ -213,12 +222,14 @@ class MAGNUM_EXPORT Buffer { * is available in OpenGL ES 2.0. */ StreamCopy = GL_STREAM_COPY, + #endif /** * Set once by the application and used frequently for drawing. */ StaticDraw = GL_STATIC_DRAW, + #ifndef MAGNUM_TARGET_GLES2 /** * Set once as output from an OpenGL command and queried many * times by the application. @@ -234,12 +245,16 @@ class MAGNUM_EXPORT Buffer { * is available in OpenGL ES 2.0. */ StaticCopy = GL_STATIC_COPY, + #endif /** * Updated frequently by the application and used frequently * for drawing or copying to other images. */ - DynamicDraw = GL_DYNAMIC_DRAW, + DynamicDraw = GL_DYNAMIC_DRAW + + #ifndef MAGNUM_TARGET_GLES2 + , /** * Updated frequently as output from OpenGL command and queried @@ -256,6 +271,7 @@ class MAGNUM_EXPORT Buffer { * is available in OpenGL ES 2.0. */ DynamicCopy = GL_DYNAMIC_COPY + #endif }; /** diff --git a/src/BufferedImage.cpp b/src/BufferedImage.cpp index 54fdeb03a..f75688054 100644 --- a/src/BufferedImage.cpp +++ b/src/BufferedImage.cpp @@ -17,6 +17,7 @@ namespace Magnum { +#ifndef MAGNUM_TARGET_GLES2 template void BufferedImage::setData(const typename DimensionTraits::VectorType& size, Components components, ComponentType type, const GLvoid* data, Buffer::Usage usage) { _components = components; _type = type; @@ -27,5 +28,6 @@ template void BufferedImage::setData(const template class BufferedImage<1>; template class BufferedImage<2>; template class BufferedImage<3>; +#endif } diff --git a/src/BufferedImage.h b/src/BufferedImage.h index 0831f653b..bcc10c985 100644 --- a/src/BufferedImage.h +++ b/src/BufferedImage.h @@ -15,9 +15,11 @@ GNU Lesser General Public License version 3 for more details. */ +#ifndef MAGNUM_TARGET_GLES2 /** @file * @brief Class Magnum::BufferedImage, typedef Magnum::BufferedImage1D, Magnum::BufferedImage2D, Magnum::BufferedImage3D */ +#endif #include "Math/Vector3.h" #include "AbstractImage.h" @@ -27,6 +29,7 @@ namespace Magnum { +#ifndef MAGNUM_TARGET_GLES2 /** @brief %Buffered image @@ -117,6 +120,7 @@ typedef BufferedImage<2> BufferedImage2D; /** @brief Three-dimensional buffered image */ typedef BufferedImage<3> BufferedImage3D; +#endif } diff --git a/src/Context.cpp b/src/Context.cpp index d26f2a97f..2b2eddd68 100644 --- a/src/Context.cpp +++ b/src/Context.cpp @@ -160,8 +160,13 @@ Context* Context::_current = nullptr; Context::Context() { /* Version */ + #ifndef MAGNUM_TARGET_GLES2 glGetIntegerv(GL_MAJOR_VERSION, &_majorVersion); glGetIntegerv(GL_MINOR_VERSION, &_minorVersion); + #else + _majorVersion = 2; + _minorVersion = 0; + #endif _version = static_cast(_majorVersion*100+_minorVersion*10); /* Get first future (not supported) version */ diff --git a/src/Framebuffer.cpp b/src/Framebuffer.cpp index c545c0dc6..f63c9915f 100644 --- a/src/Framebuffer.cpp +++ b/src/Framebuffer.cpp @@ -51,6 +51,7 @@ void Framebuffer::read(const Math::Vector2& offset, const Math::Vector2setData(size, components, type, data); } +#ifndef MAGNUM_TARGET_GLES2 void Framebuffer::read(const Math::Vector2& offset, const Math::Vector2& size, AbstractImage::Components components, AbstractImage::ComponentType type, BufferedImage2D* image, Buffer::Usage usage) { /* If the buffer doesn't have sufficient size, resize it */ /** @todo Explicitly reset also when buffer usage changes */ @@ -60,5 +61,6 @@ void Framebuffer::read(const Math::Vector2& offset, const Math::Vector2buffer()->bind(Buffer::Target::PixelPack); glReadPixels(offset.x(), offset.y(), size.x(), size.y(), static_cast(components), static_cast(type), nullptr); } +#endif } diff --git a/src/Framebuffer.h b/src/Framebuffer.h index 3edfac3fa..26c2aed44 100644 --- a/src/Framebuffer.h +++ b/src/Framebuffer.h @@ -29,12 +29,16 @@ namespace Magnum { +#ifndef MAGNUM_TARGET_GLES2 template class BufferedImage; +#endif template class Image; +#ifndef MAGNUM_TARGET_GLES2 typedef BufferedImage<1> BufferedImage1D; typedef BufferedImage<2> BufferedImage2D; typedef BufferedImage<3> BufferedImage3D; +#endif typedef Image<1> Image1D; typedef Image<2> Image2D; typedef Image<3> Image3D; @@ -433,8 +437,10 @@ class MAGNUM_EXPORT Framebuffer { enum class BlendEquation: GLenum { Add = GL_FUNC_ADD, /**< `source + destination` */ Subtract = GL_FUNC_SUBTRACT, /**< `source - destination` */ - ReverseSubtract = GL_FUNC_REVERSE_SUBTRACT, /**< `destination - source` */ + ReverseSubtract = GL_FUNC_REVERSE_SUBTRACT /**< `destination - source` */ + #ifndef MAGNUM_TARGET_GLES2 + , /** * `min(source, destination)` * @requires_gles30 %Extension @es_extension2{EXT,blend_minmax,blend_minmax} @@ -446,6 +452,7 @@ class MAGNUM_EXPORT Framebuffer { * @requires_gles30 %Extension @es_extension2{EXT,blend_minmax,blend_minmax} */ Max = GL_MAX + #endif }; /** @@ -1262,6 +1269,7 @@ class MAGNUM_EXPORT Framebuffer { */ static void read(const Math::Vector2& offset, const Math::Vector2& size, AbstractImage::Components components, AbstractImage::ComponentType type, Image2D* image); + #ifndef MAGNUM_TARGET_GLES2 /** * @brief Read block of pixels from framebuffer to buffered image * @param offset Offset in the framebuffer @@ -1276,6 +1284,7 @@ class MAGNUM_EXPORT Framebuffer { * @requires_gles30 Pixel buffer objects are not available in OpenGL ES 2.0. */ static void read(const Math::Vector2& offset, const Math::Vector2& size, AbstractImage::Components components, AbstractImage::ComponentType type, BufferedImage2D* image, Buffer::Usage usage); + #endif /*@}*/ diff --git a/src/Implementation/BufferState.cpp b/src/Implementation/BufferState.cpp index b8ef09cd4..229be3504 100644 --- a/src/Implementation/BufferState.cpp +++ b/src/Implementation/BufferState.cpp @@ -21,14 +21,18 @@ namespace Magnum { namespace Implementation { const Buffer::Target BufferState::targetForIndex[] = { Buffer::Target::Array, + Buffer::Target::ElementArray + #ifndef MAGNUM_TARGET_GLES2 + , Buffer::Target::CopyRead, Buffer::Target::CopyWrite, - Buffer::Target::ElementArray, Buffer::Target::PixelPack, Buffer::Target::PixelUnpack, Buffer::Target::TransformFeedback, - Buffer::Target::Uniform, + Buffer::Target::Uniform + #endif #ifndef MAGNUM_TARGET_GLES + , Buffer::Target::AtomicCounter, Buffer::Target::DispatchIndirect, Buffer::Target::DrawIndirect, @@ -40,13 +44,15 @@ const Buffer::Target BufferState::targetForIndex[] = { std::size_t BufferState::indexForTarget(Buffer::Target target) { switch(target) { case Buffer::Target::Array: return 1; - case Buffer::Target::CopyRead: return 2; - case Buffer::Target::CopyWrite: return 3; - case Buffer::Target::ElementArray: return 4; + case Buffer::Target::ElementArray: return 2; + #ifndef MAGNUM_TARGET_GLES2 + case Buffer::Target::CopyRead: return 3; + case Buffer::Target::CopyWrite: return 4; case Buffer::Target::PixelPack: return 5; case Buffer::Target::PixelUnpack: return 6; case Buffer::Target::TransformFeedback: return 7; case Buffer::Target::Uniform: return 8; + #endif #ifndef MAGNUM_TARGET_GLES case Buffer::Target::AtomicCounter: return 9; case Buffer::Target::DispatchIndirect: return 10; diff --git a/src/Implementation/BufferState.h b/src/Implementation/BufferState.h index 3ea1e551b..097d3ea56 100644 --- a/src/Implementation/BufferState.h +++ b/src/Implementation/BufferState.h @@ -25,7 +25,11 @@ struct BufferState { #ifndef MAGNUM_TARGET_GLES static const std::size_t TargetCount = 13+1; #else + #ifndef MAGNUM_TARGET_GLES2 static const std::size_t TargetCount = 8+1; + #else + static const std::size_t TargetCount = 2+1; + #endif #endif /* Target <-> index mapping */ diff --git a/src/Renderbuffer.cpp b/src/Renderbuffer.cpp index aa08c7b63..bb5be459b 100644 --- a/src/Renderbuffer.cpp +++ b/src/Renderbuffer.cpp @@ -17,6 +17,7 @@ namespace Magnum { +#ifndef MAGNUM_TARGET_GLES2 Renderbuffer::InternalFormat::InternalFormat(Components components, ComponentType type) { #ifndef MAGNUM_TARGET_GLES #define internalFormatSwitch(c) switch(type) { \ @@ -71,5 +72,6 @@ Renderbuffer::InternalFormat::InternalFormat(Components components, ComponentTyp internalFormatSwitch(RGBA) #undef internalFormatSwitch } +#endif } diff --git a/src/Renderbuffer.h b/src/Renderbuffer.h index a2da42736..23b03e657 100644 --- a/src/Renderbuffer.h +++ b/src/Renderbuffer.h @@ -42,6 +42,7 @@ class Renderbuffer { public: /** @{ @name Internal renderbuffer formats */ + #ifndef MAGNUM_TARGET_GLES2 /** * @copybrief AbstractTexture::Components * @@ -67,6 +68,7 @@ class Renderbuffer { , NormalizedUnsignedShort #endif }; + #endif /** * @copybrief AbstractTexture::Format @@ -76,15 +78,27 @@ class Renderbuffer { * compressed formats, but with added separate stencil index. */ enum class Format: GLenum { - Red = GL_RED, RedGreen = GL_RG, RGBA = GL_RGBA, + #ifndef MAGNUM_TARGET_GLES2 + Red = GL_RED, RedGreen = GL_RG, + #endif + + RGBA = GL_RGBA, #ifndef MAGNUM_TARGET_GLES BGRA = GL_BGRA, #endif + #ifndef MAGNUM_TARGET_GLES2 SRGBA = GL_SRGB8_ALPHA8, RGB10Alpha2 = GL_RGB10_A2, - RGB10AlphaUnsigned2 = GL_RGB10_A2UI, RGB5Alpha1 = GL_RGB5_A1, - RGBA4 = GL_RGBA4, RFloat11GFloat11BFloat10 = GL_R11F_G11F_B10F, + RGB10AlphaUnsigned2 = GL_RGB10_A2UI, + #endif + + RGB5Alpha1 = GL_RGB5_A1, + RGBA4 = GL_RGBA4, + + #ifndef MAGNUM_TARGET_GLES2 + RFloat11GFloat11BFloat10 = GL_R11F_G11F_B10F, + #endif /* 1.5.6 <= GLEW < 1.8.0 doesn't have this, even if there is GL_ARB_ES2_compatibility */ @@ -156,8 +170,10 @@ class Renderbuffer { /** @copydoc AbstractTexture::InternalFormat */ class MAGNUM_EXPORT InternalFormat { public: + #ifndef MAGNUM_TARGET_GLES2 /** @copydoc AbstractTexture::InternalFormat::InternalFormat(AbstractTexture::Components, AbstractTexture::ComponentType) */ InternalFormat(Components components, ComponentType type); + #endif /** @copydoc AbstractTexture::InternalFormat::InternalFormat(AbstractTexture::Format) */ inline constexpr InternalFormat(Format format): internalFormat(static_cast(format)) {} @@ -223,6 +239,7 @@ class Renderbuffer { GLuint renderbuffer; }; +#ifndef MAGNUM_TARGET_GLES2 /** @relates Renderbuffer @brief Convertor of component count and data type to InternalFormat @@ -237,6 +254,7 @@ inline Renderbuffer::InternalFormat operator|(Renderbuffer::Components component inline Renderbuffer::InternalFormat operator|(Renderbuffer::ComponentType type, Renderbuffer::Components components) { return Renderbuffer::InternalFormat(components, type); } +#endif } From b6b15e387f1e476a5056de125cd7cdf4a96e74dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 10 Nov 2012 20:26:49 +0100 Subject: [PATCH 02/18] Don't compile and install unsupported functionality if targetting ES 2.0. --- src/CMakeLists.txt | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c9fd8c6de..19b3dea06 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -27,7 +27,6 @@ set(Magnum_SRCS AbstractTexture.cpp AbstractShaderProgram.cpp Buffer.cpp - BufferedImage.cpp Context.cpp Framebuffer.cpp Image.cpp @@ -54,11 +53,16 @@ if(NOT TARGET_GLES) BufferedTexture.cpp) endif() +# Not-ES2 code +if(NOT TARGET_GLES2) + set(Magnum_SRCS ${Magnum_SRCS} + BufferedImage.cpp) +endif() + set(Magnum_HEADERS AbstractImage.h AbstractShaderProgram.h AbstractTexture.h - BufferedImage.h Buffer.h Color.h Context.h @@ -92,6 +96,12 @@ if(NOT TARGET_GLES) CubeMapTextureArray.h) endif() +# Not-ES2 headers +if(NOT TARGET_GLES2) + set(Magnum_HEADERS ${Magnum_HEADERS} + BufferedImage.h) +endif() + add_library(MagnumObjects OBJECT ${Magnum_SRCS}) # Files shared between main library and math unit test library From 45a236fb072923d8d4b4d918b6f6546d26ba0bb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 10 Nov 2012 20:29:03 +0100 Subject: [PATCH 03/18] Temporary workaround for extension-only functionality in ES 2.0. Will be re-enabled when some solution for extensions is done. --- src/Framebuffer.h | 27 +++++++++++++++++++++++++++ src/Query.h | 14 ++++++++++++-- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/src/Framebuffer.h b/src/Framebuffer.h index 26c2aed44..77b1a1746 100644 --- a/src/Framebuffer.h +++ b/src/Framebuffer.h @@ -945,7 +945,12 @@ class MAGNUM_EXPORT Framebuffer { */ inline static void mapDefaultForRead(DefaultReadAttachment attachment) { bindDefault(Target::Read); + /** @todo Get some extension wrangler instead to avoid undeclared glReadBuffer() on ES2 */ + #ifndef MAGNUM_TARGET_GLES2 glReadBuffer(static_cast(attachment)); + #else + static_cast(attachment); + #endif } /** @@ -960,7 +965,12 @@ class MAGNUM_EXPORT Framebuffer { */ inline void mapForRead(std::uint8_t colorAttachment) { bind(Target::Read); + /** @todo Get some extension wrangler instead to avoid undeclared glReadBuffer() on ES2 */ + #ifndef MAGNUM_TARGET_GLES2 glReadBuffer(GL_COLOR_ATTACHMENT0 + colorAttachment); + #else + static_cast(colorAttachment); + #endif } /*@}*/ @@ -1232,7 +1242,17 @@ class MAGNUM_EXPORT Framebuffer { * @requires_gles30 %Extension @es_extension{ANGLE,framebuffer_blit} */ inline static void blit(const Math::Vector2& bottomLeft, const Math::Vector2& topRight, const Math::Vector2& destinationBottomLeft, const Math::Vector2& destinationTopRight, BlitMask blitMask, AbstractTexture::Filter filter) { + /** @todo Get some extension wrangler instead to avoid undeclared glBlitFramebuffer() on ES2 */ + #ifndef MAGNUM_TARGET_GLES2 glBlitFramebuffer(bottomLeft.x(), bottomLeft.y(), topRight.x(), topRight.y(), destinationBottomLeft.x(), destinationBottomLeft.y(), destinationTopRight.x(), destinationTopRight.y(), static_cast(blitMask), static_cast(filter)); + #else + static_cast(bottomLeft); + static_cast(topRight); + static_cast(destinationBottomLeft); + static_cast(destinationTopRight); + static_cast(blitMask); + static_cast(filter); + #endif } /** @@ -1253,7 +1273,14 @@ class MAGNUM_EXPORT Framebuffer { * @requires_gles30 %Extension @es_extension{ANGLE,framebuffer_blit} */ inline static void blit(const Math::Vector2& bottomLeft, const Math::Vector2& topRight, BlitMask blitMask) { + /** @todo Get some extension wrangler instead to avoid undeclared glBlitFramebuffer() on ES2 */ + #ifndef MAGNUM_TARGET_GLES2 glBlitFramebuffer(bottomLeft.x(), bottomLeft.y(), topRight.x(), topRight.y(), bottomLeft.x(), bottomLeft.y(), topRight.x(), topRight.y(), static_cast(blitMask), static_cast(AbstractTexture::Filter::NearestNeighbor)); + #else + static_cast(bottomLeft); + static_cast(topRight); + static_cast(blitMask); + #endif } /** diff --git a/src/Query.h b/src/Query.h index 4657775c4..4816ba2a7 100644 --- a/src/Query.h +++ b/src/Query.h @@ -40,7 +40,12 @@ class MAGNUM_EXPORT AbstractQuery { * Generates one OpenGL query. * @see @fn_gl{GenQueries} */ - inline AbstractQuery() { glGenQueries(1, &_id); } + inline AbstractQuery() { + /** @todo Get some extension wrangler instead to avoid undeclared glGenQueries() on ES2 */ + #ifndef MAGNUM_TARGET_GLES2 + glGenQueries(1, &_id); + #endif + } /** * @brief Destructor @@ -48,7 +53,12 @@ class MAGNUM_EXPORT AbstractQuery { * Deletes assigned OpenGL query. * @see @fn_gl{DeleteQueries} */ - virtual inline ~AbstractQuery() { glDeleteQueries(1, &_id); } + virtual inline ~AbstractQuery() { + /** @todo Get some extension wrangler instead to avoid undeclared glGenQueries() on ES2 */ + #ifndef MAGNUM_TARGET_GLES2 + glDeleteQueries(1, &_id); + #endif + } /** @brief OpenGL query ID */ inline GLuint id() const { return _id; } From 79e39585d34294cf4a8421ef6369ae77099a77b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 10 Nov 2012 20:36:02 +0100 Subject: [PATCH 04/18] Updated external OpenGL headers. --- external/GL/glcorearb.h | 39 ++++++++++----------------------------- external/GLES3/gl3.h | 4 +--- 2 files changed, 11 insertions(+), 32 deletions(-) diff --git a/external/GL/glcorearb.h b/external/GL/glcorearb.h index e8474135e..34e61f297 100644 --- a/external/GL/glcorearb.h +++ b/external/GL/glcorearb.h @@ -31,15 +31,15 @@ extern "C" { /* glcorearb.h replaces gl3.h. It is for use with OpenGL core * profile implementations. * - * glcorearb.h last updated on $Date: 2012-08-13 16:18:01 -0700 (Mon, 13 Aug 2012) $ + * glcorearb.h last updated on $Date: 2012-09-19 19:02:24 -0700 (Wed, 19 Sep 2012) $ * - * RELEASE NOTES - 2012/08/13 + * RELEASE NOTES - 2012/09/19 * * glcorearb.h should be placed in the same directory as gl.h and * included as * ''. * - * gl3.h includes only APIs in the latest OpenGL core profile + * glcorearb.h includes only APIs in the latest OpenGL core profile * implementation together with APIs in newer ARB extensions which can be * can be supported by the core profile. It does not, and never will * include functionality removed from the core profile, such as @@ -48,7 +48,7 @@ extern "C" { * It is not possible to #include both and either of * or in the same source file. * - * Feedback can be given by register for the Khronos Bugzilla + * Feedback can be given by registering for the Khronos Bugzilla * (www.khronos.org/bugzilla) and filing issues there under product * "OpenGL", category "Registry". */ @@ -107,6 +107,7 @@ typedef void GLvoid; #define GL_TRIANGLES 0x0004 #define GL_TRIANGLE_STRIP 0x0005 #define GL_TRIANGLE_FAN 0x0006 +#define GL_QUADS 0x0007 /* AlphaFunction */ #define GL_NEVER 0x0200 #define GL_LESS 0x0201 @@ -157,6 +158,7 @@ typedef void GLvoid; #define GL_LINE_WIDTH 0x0B21 #define GL_LINE_WIDTH_RANGE 0x0B22 #define GL_LINE_WIDTH_GRANULARITY 0x0B23 +#define GL_POLYGON_MODE 0x0B40 #define GL_POLYGON_SMOOTH 0x0B41 #define GL_CULL_FACE 0x0B44 #define GL_CULL_FACE_MODE 0x0B45 @@ -484,6 +486,7 @@ typedef void GLvoid; #define GL_DYNAMIC_READ 0x88E9 #define GL_DYNAMIC_COPY 0x88EA #define GL_SAMPLES_PASSED 0x8914 +#define GL_SRC1_ALPHA 0x8589 #endif #ifndef GL_VERSION_2_0 @@ -827,7 +830,6 @@ typedef void GLvoid; #define GL_MAX_TEXTURE_BUFFER_SIZE 0x8C2B #define GL_TEXTURE_BINDING_BUFFER 0x8C2C #define GL_TEXTURE_BUFFER_DATA_STORE_BINDING 0x8C2D -#define GL_TEXTURE_BUFFER_FORMAT 0x8C2E #define GL_TEXTURE_RECTANGLE 0x84F5 #define GL_TEXTURE_BINDING_RECTANGLE 0x84F6 #define GL_PROXY_TEXTURE_RECTANGLE 0x84F7 @@ -1093,6 +1095,7 @@ typedef void GLvoid; /* reuse GL_MEDIUM_INT */ /* reuse GL_HIGH_INT */ /* reuse GL_SHADER_COMPILER */ +/* reuse GL_SHADER_BINARY_FORMATS */ /* reuse GL_NUM_SHADER_BINARY_FORMATS */ /* reuse GL_MAX_VERTEX_UNIFORM_VECTORS */ /* reuse GL_MAX_VARYING_VECTORS */ @@ -1796,6 +1799,7 @@ typedef void GLvoid; #ifndef GL_ARB_texture_gather #define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5E #define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5F +#define GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB 0x8F9F #endif #ifndef GL_ARB_texture_query_lod @@ -1973,6 +1977,7 @@ typedef void GLvoid; #define GL_MEDIUM_INT 0x8DF4 #define GL_HIGH_INT 0x8DF5 #define GL_SHADER_COMPILER 0x8DFA +#define GL_SHADER_BINARY_FORMATS 0x8DF8 #define GL_NUM_SHADER_BINARY_FORMATS 0x8DF9 #define GL_MAX_VERTEX_UNIFORM_VECTORS 0x8DFB #define GL_MAX_VARYING_VECTORS 0x8DFC @@ -4176,18 +4181,6 @@ typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGARBPROC) (GLuint count, GLsizei #define GL_ARB_robustness 1 #ifdef GLCOREARB_PROTOTYPES GLAPI GLenum APIENTRY glGetGraphicsResetStatusARB (void); -GLAPI void APIENTRY glGetnMapdvARB (GLenum target, GLenum query, GLsizei bufSize, GLdouble *v); -GLAPI void APIENTRY glGetnMapfvARB (GLenum target, GLenum query, GLsizei bufSize, GLfloat *v); -GLAPI void APIENTRY glGetnMapivARB (GLenum target, GLenum query, GLsizei bufSize, GLint *v); -GLAPI void APIENTRY glGetnPixelMapfvARB (GLenum map, GLsizei bufSize, GLfloat *values); -GLAPI void APIENTRY glGetnPixelMapuivARB (GLenum map, GLsizei bufSize, GLuint *values); -GLAPI void APIENTRY glGetnPixelMapusvARB (GLenum map, GLsizei bufSize, GLushort *values); -GLAPI void APIENTRY glGetnPolygonStippleARB (GLsizei bufSize, GLubyte *pattern); -GLAPI void APIENTRY glGetnColorTableARB (GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *table); -GLAPI void APIENTRY glGetnConvolutionFilterARB (GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *image); -GLAPI void APIENTRY glGetnSeparableFilterARB (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid *row, GLsizei columnBufSize, GLvoid *column, GLvoid *span); -GLAPI void APIENTRY glGetnHistogramARB (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values); -GLAPI void APIENTRY glGetnMinmaxARB (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values); GLAPI void APIENTRY glGetnTexImageARB (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid *img); GLAPI void APIENTRY glReadnPixelsARB (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid *data); GLAPI void APIENTRY glGetnCompressedTexImageARB (GLenum target, GLint lod, GLsizei bufSize, GLvoid *img); @@ -4197,18 +4190,6 @@ GLAPI void APIENTRY glGetnUniformuivARB (GLuint program, GLint location, GLsizei GLAPI void APIENTRY glGetnUniformdvARB (GLuint program, GLint location, GLsizei bufSize, GLdouble *params); #endif /* GLCOREARB_PROTOTYPES */ typedef GLenum (APIENTRYP PFNGLGETGRAPHICSRESETSTATUSARBPROC) (void); -typedef void (APIENTRYP PFNGLGETNMAPDVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLdouble *v); -typedef void (APIENTRYP PFNGLGETNMAPFVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLfloat *v); -typedef void (APIENTRYP PFNGLGETNMAPIVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLint *v); -typedef void (APIENTRYP PFNGLGETNPIXELMAPFVARBPROC) (GLenum map, GLsizei bufSize, GLfloat *values); -typedef void (APIENTRYP PFNGLGETNPIXELMAPUIVARBPROC) (GLenum map, GLsizei bufSize, GLuint *values); -typedef void (APIENTRYP PFNGLGETNPIXELMAPUSVARBPROC) (GLenum map, GLsizei bufSize, GLushort *values); -typedef void (APIENTRYP PFNGLGETNPOLYGONSTIPPLEARBPROC) (GLsizei bufSize, GLubyte *pattern); -typedef void (APIENTRYP PFNGLGETNCOLORTABLEARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *table); -typedef void (APIENTRYP PFNGLGETNCONVOLUTIONFILTERARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *image); -typedef void (APIENTRYP PFNGLGETNSEPARABLEFILTERARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid *row, GLsizei columnBufSize, GLvoid *column, GLvoid *span); -typedef void (APIENTRYP PFNGLGETNHISTOGRAMARBPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values); -typedef void (APIENTRYP PFNGLGETNMINMAXARBPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values); typedef void (APIENTRYP PFNGLGETNTEXIMAGEARBPROC) (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid *img); typedef void (APIENTRYP PFNGLREADNPIXELSARBPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid *data); typedef void (APIENTRYP PFNGLGETNCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint lod, GLsizei bufSize, GLvoid *img); diff --git a/external/GLES3/gl3.h b/external/GLES3/gl3.h index 738232eaa..7d9b04d94 100644 --- a/external/GLES3/gl3.h +++ b/external/GLES3/gl3.h @@ -2,7 +2,7 @@ #define __gl3_h_ /* - * gl3.h last updated on $Date: 2012-07-23 03:53:52 -0700 (Mon, 23 Jul 2012) $ + * gl3.h last updated on $Date: 2012-09-12 10:13:02 -0700 (Wed, 12 Sep 2012) $ */ #include @@ -507,8 +507,6 @@ typedef struct __GLsync *GLsync; #define GL_RGBA8 0x8058 #define GL_RGB10_A2 0x8059 #define GL_TEXTURE_BINDING_3D 0x806A -#define GL_PACK_SKIP_IMAGES 0x806B -#define GL_PACK_IMAGE_HEIGHT 0x806C #define GL_UNPACK_SKIP_IMAGES 0x806D #define GL_UNPACK_IMAGE_HEIGHT 0x806E #define GL_TEXTURE_3D 0x806F From 9ccb1869fc7322b94dfc1c513cde84cf833a1803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 10 Nov 2012 20:36:38 +0100 Subject: [PATCH 05/18] Added headers for OpenGL ES 2.0. --- external/GLES2/gl2.h | 620 ++++++++++++++ external/GLES2/gl2ext.h | 1808 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 2428 insertions(+) create mode 100644 external/GLES2/gl2.h create mode 100644 external/GLES2/gl2ext.h diff --git a/external/GLES2/gl2.h b/external/GLES2/gl2.h new file mode 100644 index 000000000..b7fe76ee1 --- /dev/null +++ b/external/GLES2/gl2.h @@ -0,0 +1,620 @@ +#ifndef __gl2_h_ +#define __gl2_h_ + +/* $Revision: 16803 $ on $Date:: 2012-02-02 09:49:18 -0800 #$ */ + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/* + * This document is licensed under the SGI Free Software B License Version + * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . + */ + +/*------------------------------------------------------------------------- + * Data type definitions + *-----------------------------------------------------------------------*/ + +typedef void GLvoid; +typedef char GLchar; +typedef unsigned int GLenum; +typedef unsigned char GLboolean; +typedef unsigned int GLbitfield; +typedef khronos_int8_t GLbyte; +typedef short GLshort; +typedef int GLint; +typedef int GLsizei; +typedef khronos_uint8_t GLubyte; +typedef unsigned short GLushort; +typedef unsigned int GLuint; +typedef khronos_float_t GLfloat; +typedef khronos_float_t GLclampf; +typedef khronos_int32_t GLfixed; + +/* GL types for handling large vertex buffer objects */ +typedef khronos_intptr_t GLintptr; +typedef khronos_ssize_t GLsizeiptr; + +/* OpenGL ES core versions */ +#define GL_ES_VERSION_2_0 1 + +/* ClearBufferMask */ +#define GL_DEPTH_BUFFER_BIT 0x00000100 +#define GL_STENCIL_BUFFER_BIT 0x00000400 +#define GL_COLOR_BUFFER_BIT 0x00004000 + +/* Boolean */ +#define GL_FALSE 0 +#define GL_TRUE 1 + +/* BeginMode */ +#define GL_POINTS 0x0000 +#define GL_LINES 0x0001 +#define GL_LINE_LOOP 0x0002 +#define GL_LINE_STRIP 0x0003 +#define GL_TRIANGLES 0x0004 +#define GL_TRIANGLE_STRIP 0x0005 +#define GL_TRIANGLE_FAN 0x0006 + +/* AlphaFunction (not supported in ES20) */ +/* GL_NEVER */ +/* GL_LESS */ +/* GL_EQUAL */ +/* GL_LEQUAL */ +/* GL_GREATER */ +/* GL_NOTEQUAL */ +/* GL_GEQUAL */ +/* GL_ALWAYS */ + +/* BlendingFactorDest */ +#define GL_ZERO 0 +#define GL_ONE 1 +#define GL_SRC_COLOR 0x0300 +#define GL_ONE_MINUS_SRC_COLOR 0x0301 +#define GL_SRC_ALPHA 0x0302 +#define GL_ONE_MINUS_SRC_ALPHA 0x0303 +#define GL_DST_ALPHA 0x0304 +#define GL_ONE_MINUS_DST_ALPHA 0x0305 + +/* BlendingFactorSrc */ +/* GL_ZERO */ +/* GL_ONE */ +#define GL_DST_COLOR 0x0306 +#define GL_ONE_MINUS_DST_COLOR 0x0307 +#define GL_SRC_ALPHA_SATURATE 0x0308 +/* GL_SRC_ALPHA */ +/* GL_ONE_MINUS_SRC_ALPHA */ +/* GL_DST_ALPHA */ +/* GL_ONE_MINUS_DST_ALPHA */ + +/* BlendEquationSeparate */ +#define GL_FUNC_ADD 0x8006 +#define GL_BLEND_EQUATION 0x8009 +#define GL_BLEND_EQUATION_RGB 0x8009 /* same as BLEND_EQUATION */ +#define GL_BLEND_EQUATION_ALPHA 0x883D + +/* BlendSubtract */ +#define GL_FUNC_SUBTRACT 0x800A +#define GL_FUNC_REVERSE_SUBTRACT 0x800B + +/* Separate Blend Functions */ +#define GL_BLEND_DST_RGB 0x80C8 +#define GL_BLEND_SRC_RGB 0x80C9 +#define GL_BLEND_DST_ALPHA 0x80CA +#define GL_BLEND_SRC_ALPHA 0x80CB +#define GL_CONSTANT_COLOR 0x8001 +#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002 +#define GL_CONSTANT_ALPHA 0x8003 +#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004 +#define GL_BLEND_COLOR 0x8005 + +/* Buffer Objects */ +#define GL_ARRAY_BUFFER 0x8892 +#define GL_ELEMENT_ARRAY_BUFFER 0x8893 +#define GL_ARRAY_BUFFER_BINDING 0x8894 +#define GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895 + +#define GL_STREAM_DRAW 0x88E0 +#define GL_STATIC_DRAW 0x88E4 +#define GL_DYNAMIC_DRAW 0x88E8 + +#define GL_BUFFER_SIZE 0x8764 +#define GL_BUFFER_USAGE 0x8765 + +#define GL_CURRENT_VERTEX_ATTRIB 0x8626 + +/* CullFaceMode */ +#define GL_FRONT 0x0404 +#define GL_BACK 0x0405 +#define GL_FRONT_AND_BACK 0x0408 + +/* DepthFunction */ +/* GL_NEVER */ +/* GL_LESS */ +/* GL_EQUAL */ +/* GL_LEQUAL */ +/* GL_GREATER */ +/* GL_NOTEQUAL */ +/* GL_GEQUAL */ +/* GL_ALWAYS */ + +/* EnableCap */ +#define GL_TEXTURE_2D 0x0DE1 +#define GL_CULL_FACE 0x0B44 +#define GL_BLEND 0x0BE2 +#define GL_DITHER 0x0BD0 +#define GL_STENCIL_TEST 0x0B90 +#define GL_DEPTH_TEST 0x0B71 +#define GL_SCISSOR_TEST 0x0C11 +#define GL_POLYGON_OFFSET_FILL 0x8037 +#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E +#define GL_SAMPLE_COVERAGE 0x80A0 + +/* ErrorCode */ +#define GL_NO_ERROR 0 +#define GL_INVALID_ENUM 0x0500 +#define GL_INVALID_VALUE 0x0501 +#define GL_INVALID_OPERATION 0x0502 +#define GL_OUT_OF_MEMORY 0x0505 + +/* FrontFaceDirection */ +#define GL_CW 0x0900 +#define GL_CCW 0x0901 + +/* GetPName */ +#define GL_LINE_WIDTH 0x0B21 +#define GL_ALIASED_POINT_SIZE_RANGE 0x846D +#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E +#define GL_CULL_FACE_MODE 0x0B45 +#define GL_FRONT_FACE 0x0B46 +#define GL_DEPTH_RANGE 0x0B70 +#define GL_DEPTH_WRITEMASK 0x0B72 +#define GL_DEPTH_CLEAR_VALUE 0x0B73 +#define GL_DEPTH_FUNC 0x0B74 +#define GL_STENCIL_CLEAR_VALUE 0x0B91 +#define GL_STENCIL_FUNC 0x0B92 +#define GL_STENCIL_FAIL 0x0B94 +#define GL_STENCIL_PASS_DEPTH_FAIL 0x0B95 +#define GL_STENCIL_PASS_DEPTH_PASS 0x0B96 +#define GL_STENCIL_REF 0x0B97 +#define GL_STENCIL_VALUE_MASK 0x0B93 +#define GL_STENCIL_WRITEMASK 0x0B98 +#define GL_STENCIL_BACK_FUNC 0x8800 +#define GL_STENCIL_BACK_FAIL 0x8801 +#define GL_STENCIL_BACK_PASS_DEPTH_FAIL 0x8802 +#define GL_STENCIL_BACK_PASS_DEPTH_PASS 0x8803 +#define GL_STENCIL_BACK_REF 0x8CA3 +#define GL_STENCIL_BACK_VALUE_MASK 0x8CA4 +#define GL_STENCIL_BACK_WRITEMASK 0x8CA5 +#define GL_VIEWPORT 0x0BA2 +#define GL_SCISSOR_BOX 0x0C10 +/* GL_SCISSOR_TEST */ +#define GL_COLOR_CLEAR_VALUE 0x0C22 +#define GL_COLOR_WRITEMASK 0x0C23 +#define GL_UNPACK_ALIGNMENT 0x0CF5 +#define GL_PACK_ALIGNMENT 0x0D05 +#define GL_MAX_TEXTURE_SIZE 0x0D33 +#define GL_MAX_VIEWPORT_DIMS 0x0D3A +#define GL_SUBPIXEL_BITS 0x0D50 +#define GL_RED_BITS 0x0D52 +#define GL_GREEN_BITS 0x0D53 +#define GL_BLUE_BITS 0x0D54 +#define GL_ALPHA_BITS 0x0D55 +#define GL_DEPTH_BITS 0x0D56 +#define GL_STENCIL_BITS 0x0D57 +#define GL_POLYGON_OFFSET_UNITS 0x2A00 +/* GL_POLYGON_OFFSET_FILL */ +#define GL_POLYGON_OFFSET_FACTOR 0x8038 +#define GL_TEXTURE_BINDING_2D 0x8069 +#define GL_SAMPLE_BUFFERS 0x80A8 +#define GL_SAMPLES 0x80A9 +#define GL_SAMPLE_COVERAGE_VALUE 0x80AA +#define GL_SAMPLE_COVERAGE_INVERT 0x80AB + +/* GetTextureParameter */ +/* GL_TEXTURE_MAG_FILTER */ +/* GL_TEXTURE_MIN_FILTER */ +/* GL_TEXTURE_WRAP_S */ +/* GL_TEXTURE_WRAP_T */ + +#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2 +#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3 + +/* HintMode */ +#define GL_DONT_CARE 0x1100 +#define GL_FASTEST 0x1101 +#define GL_NICEST 0x1102 + +/* HintTarget */ +#define GL_GENERATE_MIPMAP_HINT 0x8192 + +/* DataType */ +#define GL_BYTE 0x1400 +#define GL_UNSIGNED_BYTE 0x1401 +#define GL_SHORT 0x1402 +#define GL_UNSIGNED_SHORT 0x1403 +#define GL_INT 0x1404 +#define GL_UNSIGNED_INT 0x1405 +#define GL_FLOAT 0x1406 +#define GL_FIXED 0x140C + +/* PixelFormat */ +#define GL_DEPTH_COMPONENT 0x1902 +#define GL_ALPHA 0x1906 +#define GL_RGB 0x1907 +#define GL_RGBA 0x1908 +#define GL_LUMINANCE 0x1909 +#define GL_LUMINANCE_ALPHA 0x190A + +/* PixelType */ +/* GL_UNSIGNED_BYTE */ +#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033 +#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034 +#define GL_UNSIGNED_SHORT_5_6_5 0x8363 + +/* Shaders */ +#define GL_FRAGMENT_SHADER 0x8B30 +#define GL_VERTEX_SHADER 0x8B31 +#define GL_MAX_VERTEX_ATTRIBS 0x8869 +#define GL_MAX_VERTEX_UNIFORM_VECTORS 0x8DFB +#define GL_MAX_VARYING_VECTORS 0x8DFC +#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D +#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C +#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872 +#define GL_MAX_FRAGMENT_UNIFORM_VECTORS 0x8DFD +#define GL_SHADER_TYPE 0x8B4F +#define GL_DELETE_STATUS 0x8B80 +#define GL_LINK_STATUS 0x8B82 +#define GL_VALIDATE_STATUS 0x8B83 +#define GL_ATTACHED_SHADERS 0x8B85 +#define GL_ACTIVE_UNIFORMS 0x8B86 +#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87 +#define GL_ACTIVE_ATTRIBUTES 0x8B89 +#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A +#define GL_SHADING_LANGUAGE_VERSION 0x8B8C +#define GL_CURRENT_PROGRAM 0x8B8D + +/* StencilFunction */ +#define GL_NEVER 0x0200 +#define GL_LESS 0x0201 +#define GL_EQUAL 0x0202 +#define GL_LEQUAL 0x0203 +#define GL_GREATER 0x0204 +#define GL_NOTEQUAL 0x0205 +#define GL_GEQUAL 0x0206 +#define GL_ALWAYS 0x0207 + +/* StencilOp */ +/* GL_ZERO */ +#define GL_KEEP 0x1E00 +#define GL_REPLACE 0x1E01 +#define GL_INCR 0x1E02 +#define GL_DECR 0x1E03 +#define GL_INVERT 0x150A +#define GL_INCR_WRAP 0x8507 +#define GL_DECR_WRAP 0x8508 + +/* StringName */ +#define GL_VENDOR 0x1F00 +#define GL_RENDERER 0x1F01 +#define GL_VERSION 0x1F02 +#define GL_EXTENSIONS 0x1F03 + +/* TextureMagFilter */ +#define GL_NEAREST 0x2600 +#define GL_LINEAR 0x2601 + +/* TextureMinFilter */ +/* GL_NEAREST */ +/* GL_LINEAR */ +#define GL_NEAREST_MIPMAP_NEAREST 0x2700 +#define GL_LINEAR_MIPMAP_NEAREST 0x2701 +#define GL_NEAREST_MIPMAP_LINEAR 0x2702 +#define GL_LINEAR_MIPMAP_LINEAR 0x2703 + +/* TextureParameterName */ +#define GL_TEXTURE_MAG_FILTER 0x2800 +#define GL_TEXTURE_MIN_FILTER 0x2801 +#define GL_TEXTURE_WRAP_S 0x2802 +#define GL_TEXTURE_WRAP_T 0x2803 + +/* TextureTarget */ +/* GL_TEXTURE_2D */ +#define GL_TEXTURE 0x1702 + +#define GL_TEXTURE_CUBE_MAP 0x8513 +#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514 +#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515 +#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516 +#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517 +#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518 +#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519 +#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A +#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C + +/* TextureUnit */ +#define GL_TEXTURE0 0x84C0 +#define GL_TEXTURE1 0x84C1 +#define GL_TEXTURE2 0x84C2 +#define GL_TEXTURE3 0x84C3 +#define GL_TEXTURE4 0x84C4 +#define GL_TEXTURE5 0x84C5 +#define GL_TEXTURE6 0x84C6 +#define GL_TEXTURE7 0x84C7 +#define GL_TEXTURE8 0x84C8 +#define GL_TEXTURE9 0x84C9 +#define GL_TEXTURE10 0x84CA +#define GL_TEXTURE11 0x84CB +#define GL_TEXTURE12 0x84CC +#define GL_TEXTURE13 0x84CD +#define GL_TEXTURE14 0x84CE +#define GL_TEXTURE15 0x84CF +#define GL_TEXTURE16 0x84D0 +#define GL_TEXTURE17 0x84D1 +#define GL_TEXTURE18 0x84D2 +#define GL_TEXTURE19 0x84D3 +#define GL_TEXTURE20 0x84D4 +#define GL_TEXTURE21 0x84D5 +#define GL_TEXTURE22 0x84D6 +#define GL_TEXTURE23 0x84D7 +#define GL_TEXTURE24 0x84D8 +#define GL_TEXTURE25 0x84D9 +#define GL_TEXTURE26 0x84DA +#define GL_TEXTURE27 0x84DB +#define GL_TEXTURE28 0x84DC +#define GL_TEXTURE29 0x84DD +#define GL_TEXTURE30 0x84DE +#define GL_TEXTURE31 0x84DF +#define GL_ACTIVE_TEXTURE 0x84E0 + +/* TextureWrapMode */ +#define GL_REPEAT 0x2901 +#define GL_CLAMP_TO_EDGE 0x812F +#define GL_MIRRORED_REPEAT 0x8370 + +/* Uniform Types */ +#define GL_FLOAT_VEC2 0x8B50 +#define GL_FLOAT_VEC3 0x8B51 +#define GL_FLOAT_VEC4 0x8B52 +#define GL_INT_VEC2 0x8B53 +#define GL_INT_VEC3 0x8B54 +#define GL_INT_VEC4 0x8B55 +#define GL_BOOL 0x8B56 +#define GL_BOOL_VEC2 0x8B57 +#define GL_BOOL_VEC3 0x8B58 +#define GL_BOOL_VEC4 0x8B59 +#define GL_FLOAT_MAT2 0x8B5A +#define GL_FLOAT_MAT3 0x8B5B +#define GL_FLOAT_MAT4 0x8B5C +#define GL_SAMPLER_2D 0x8B5E +#define GL_SAMPLER_CUBE 0x8B60 + +/* Vertex Arrays */ +#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622 +#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623 +#define GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624 +#define GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625 +#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A +#define GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645 +#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F + +/* Read Format */ +#define GL_IMPLEMENTATION_COLOR_READ_TYPE 0x8B9A +#define GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B + +/* Shader Source */ +#define GL_COMPILE_STATUS 0x8B81 +#define GL_INFO_LOG_LENGTH 0x8B84 +#define GL_SHADER_SOURCE_LENGTH 0x8B88 +#define GL_SHADER_COMPILER 0x8DFA + +/* Shader Binary */ +#define GL_SHADER_BINARY_FORMATS 0x8DF8 +#define GL_NUM_SHADER_BINARY_FORMATS 0x8DF9 + +/* Shader Precision-Specified Types */ +#define GL_LOW_FLOAT 0x8DF0 +#define GL_MEDIUM_FLOAT 0x8DF1 +#define GL_HIGH_FLOAT 0x8DF2 +#define GL_LOW_INT 0x8DF3 +#define GL_MEDIUM_INT 0x8DF4 +#define GL_HIGH_INT 0x8DF5 + +/* Framebuffer Object. */ +#define GL_FRAMEBUFFER 0x8D40 +#define GL_RENDERBUFFER 0x8D41 + +#define GL_RGBA4 0x8056 +#define GL_RGB5_A1 0x8057 +#define GL_RGB565 0x8D62 +#define GL_DEPTH_COMPONENT16 0x81A5 +#define GL_STENCIL_INDEX8 0x8D48 + +#define GL_RENDERBUFFER_WIDTH 0x8D42 +#define GL_RENDERBUFFER_HEIGHT 0x8D43 +#define GL_RENDERBUFFER_INTERNAL_FORMAT 0x8D44 +#define GL_RENDERBUFFER_RED_SIZE 0x8D50 +#define GL_RENDERBUFFER_GREEN_SIZE 0x8D51 +#define GL_RENDERBUFFER_BLUE_SIZE 0x8D52 +#define GL_RENDERBUFFER_ALPHA_SIZE 0x8D53 +#define GL_RENDERBUFFER_DEPTH_SIZE 0x8D54 +#define GL_RENDERBUFFER_STENCIL_SIZE 0x8D55 + +#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0 +#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1 +#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2 +#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3 + +#define GL_COLOR_ATTACHMENT0 0x8CE0 +#define GL_DEPTH_ATTACHMENT 0x8D00 +#define GL_STENCIL_ATTACHMENT 0x8D20 + +#define GL_NONE 0 + +#define GL_FRAMEBUFFER_COMPLETE 0x8CD5 +#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6 +#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7 +#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS 0x8CD9 +#define GL_FRAMEBUFFER_UNSUPPORTED 0x8CDD + +#define GL_FRAMEBUFFER_BINDING 0x8CA6 +#define GL_RENDERBUFFER_BINDING 0x8CA7 +#define GL_MAX_RENDERBUFFER_SIZE 0x84E8 + +#define GL_INVALID_FRAMEBUFFER_OPERATION 0x0506 + +/*------------------------------------------------------------------------- + * GL core functions. + *-----------------------------------------------------------------------*/ + +GL_APICALL void GL_APIENTRY glActiveTexture (GLenum texture); +GL_APICALL void GL_APIENTRY glAttachShader (GLuint program, GLuint shader); +GL_APICALL void GL_APIENTRY glBindAttribLocation (GLuint program, GLuint index, const GLchar* name); +GL_APICALL void GL_APIENTRY glBindBuffer (GLenum target, GLuint buffer); +GL_APICALL void GL_APIENTRY glBindFramebuffer (GLenum target, GLuint framebuffer); +GL_APICALL void GL_APIENTRY glBindRenderbuffer (GLenum target, GLuint renderbuffer); +GL_APICALL void GL_APIENTRY glBindTexture (GLenum target, GLuint texture); +GL_APICALL void GL_APIENTRY glBlendColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); +GL_APICALL void GL_APIENTRY glBlendEquation ( GLenum mode ); +GL_APICALL void GL_APIENTRY glBlendEquationSeparate (GLenum modeRGB, GLenum modeAlpha); +GL_APICALL void GL_APIENTRY glBlendFunc (GLenum sfactor, GLenum dfactor); +GL_APICALL void GL_APIENTRY glBlendFuncSeparate (GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); +GL_APICALL void GL_APIENTRY glBufferData (GLenum target, GLsizeiptr size, const GLvoid* data, GLenum usage); +GL_APICALL void GL_APIENTRY glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid* data); +GL_APICALL GLenum GL_APIENTRY glCheckFramebufferStatus (GLenum target); +GL_APICALL void GL_APIENTRY glClear (GLbitfield mask); +GL_APICALL void GL_APIENTRY glClearColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); +GL_APICALL void GL_APIENTRY glClearDepthf (GLclampf depth); +GL_APICALL void GL_APIENTRY glClearStencil (GLint s); +GL_APICALL void GL_APIENTRY glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); +GL_APICALL void GL_APIENTRY glCompileShader (GLuint shader); +GL_APICALL void GL_APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid* data); +GL_APICALL void GL_APIENTRY glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid* data); +GL_APICALL void GL_APIENTRY glCopyTexImage2D (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); +GL_APICALL void GL_APIENTRY glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); +GL_APICALL GLuint GL_APIENTRY glCreateProgram (void); +GL_APICALL GLuint GL_APIENTRY glCreateShader (GLenum type); +GL_APICALL void GL_APIENTRY glCullFace (GLenum mode); +GL_APICALL void GL_APIENTRY glDeleteBuffers (GLsizei n, const GLuint* buffers); +GL_APICALL void GL_APIENTRY glDeleteFramebuffers (GLsizei n, const GLuint* framebuffers); +GL_APICALL void GL_APIENTRY glDeleteProgram (GLuint program); +GL_APICALL void GL_APIENTRY glDeleteRenderbuffers (GLsizei n, const GLuint* renderbuffers); +GL_APICALL void GL_APIENTRY glDeleteShader (GLuint shader); +GL_APICALL void GL_APIENTRY glDeleteTextures (GLsizei n, const GLuint* textures); +GL_APICALL void GL_APIENTRY glDepthFunc (GLenum func); +GL_APICALL void GL_APIENTRY glDepthMask (GLboolean flag); +GL_APICALL void GL_APIENTRY glDepthRangef (GLclampf zNear, GLclampf zFar); +GL_APICALL void GL_APIENTRY glDetachShader (GLuint program, GLuint shader); +GL_APICALL void GL_APIENTRY glDisable (GLenum cap); +GL_APICALL void GL_APIENTRY glDisableVertexAttribArray (GLuint index); +GL_APICALL void GL_APIENTRY glDrawArrays (GLenum mode, GLint first, GLsizei count); +GL_APICALL void GL_APIENTRY glDrawElements (GLenum mode, GLsizei count, GLenum type, const GLvoid* indices); +GL_APICALL void GL_APIENTRY glEnable (GLenum cap); +GL_APICALL void GL_APIENTRY glEnableVertexAttribArray (GLuint index); +GL_APICALL void GL_APIENTRY glFinish (void); +GL_APICALL void GL_APIENTRY glFlush (void); +GL_APICALL void GL_APIENTRY glFramebufferRenderbuffer (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); +GL_APICALL void GL_APIENTRY glFramebufferTexture2D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); +GL_APICALL void GL_APIENTRY glFrontFace (GLenum mode); +GL_APICALL void GL_APIENTRY glGenBuffers (GLsizei n, GLuint* buffers); +GL_APICALL void GL_APIENTRY glGenerateMipmap (GLenum target); +GL_APICALL void GL_APIENTRY glGenFramebuffers (GLsizei n, GLuint* framebuffers); +GL_APICALL void GL_APIENTRY glGenRenderbuffers (GLsizei n, GLuint* renderbuffers); +GL_APICALL void GL_APIENTRY glGenTextures (GLsizei n, GLuint* textures); +GL_APICALL void GL_APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name); +GL_APICALL void GL_APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name); +GL_APICALL void GL_APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders); +GL_APICALL int GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar* name); +GL_APICALL void GL_APIENTRY glGetBooleanv (GLenum pname, GLboolean* params); +GL_APICALL void GL_APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint* params); +GL_APICALL GLenum GL_APIENTRY glGetError (void); +GL_APICALL void GL_APIENTRY glGetFloatv (GLenum pname, GLfloat* params); +GL_APICALL void GL_APIENTRY glGetFramebufferAttachmentParameteriv (GLenum target, GLenum attachment, GLenum pname, GLint* params); +GL_APICALL void GL_APIENTRY glGetIntegerv (GLenum pname, GLint* params); +GL_APICALL void GL_APIENTRY glGetProgramiv (GLuint program, GLenum pname, GLint* params); +GL_APICALL void GL_APIENTRY glGetProgramInfoLog (GLuint program, GLsizei bufsize, GLsizei* length, GLchar* infolog); +GL_APICALL void GL_APIENTRY glGetRenderbufferParameteriv (GLenum target, GLenum pname, GLint* params); +GL_APICALL void GL_APIENTRY glGetShaderiv (GLuint shader, GLenum pname, GLint* params); +GL_APICALL void GL_APIENTRY glGetShaderInfoLog (GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* infolog); +GL_APICALL void GL_APIENTRY glGetShaderPrecisionFormat (GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision); +GL_APICALL void GL_APIENTRY glGetShaderSource (GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* source); +GL_APICALL const GLubyte* GL_APIENTRY glGetString (GLenum name); +GL_APICALL void GL_APIENTRY glGetTexParameterfv (GLenum target, GLenum pname, GLfloat* params); +GL_APICALL void GL_APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint* params); +GL_APICALL void GL_APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat* params); +GL_APICALL void GL_APIENTRY glGetUniformiv (GLuint program, GLint location, GLint* params); +GL_APICALL int GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar* name); +GL_APICALL void GL_APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat* params); +GL_APICALL void GL_APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint* params); +GL_APICALL void GL_APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, GLvoid** pointer); +GL_APICALL void GL_APIENTRY glHint (GLenum target, GLenum mode); +GL_APICALL GLboolean GL_APIENTRY glIsBuffer (GLuint buffer); +GL_APICALL GLboolean GL_APIENTRY glIsEnabled (GLenum cap); +GL_APICALL GLboolean GL_APIENTRY glIsFramebuffer (GLuint framebuffer); +GL_APICALL GLboolean GL_APIENTRY glIsProgram (GLuint program); +GL_APICALL GLboolean GL_APIENTRY glIsRenderbuffer (GLuint renderbuffer); +GL_APICALL GLboolean GL_APIENTRY glIsShader (GLuint shader); +GL_APICALL GLboolean GL_APIENTRY glIsTexture (GLuint texture); +GL_APICALL void GL_APIENTRY glLineWidth (GLfloat width); +GL_APICALL void GL_APIENTRY glLinkProgram (GLuint program); +GL_APICALL void GL_APIENTRY glPixelStorei (GLenum pname, GLint param); +GL_APICALL void GL_APIENTRY glPolygonOffset (GLfloat factor, GLfloat units); +GL_APICALL void GL_APIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* pixels); +GL_APICALL void GL_APIENTRY glReleaseShaderCompiler (void); +GL_APICALL void GL_APIENTRY glRenderbufferStorage (GLenum target, GLenum internalformat, GLsizei width, GLsizei height); +GL_APICALL void GL_APIENTRY glSampleCoverage (GLclampf value, GLboolean invert); +GL_APICALL void GL_APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height); +GL_APICALL void GL_APIENTRY glShaderBinary (GLsizei n, const GLuint* shaders, GLenum binaryformat, const GLvoid* binary, GLsizei length); +GL_APICALL void GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length); +GL_APICALL void GL_APIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask); +GL_APICALL void GL_APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask); +GL_APICALL void GL_APIENTRY glStencilMask (GLuint mask); +GL_APICALL void GL_APIENTRY glStencilMaskSeparate (GLenum face, GLuint mask); +GL_APICALL void GL_APIENTRY glStencilOp (GLenum fail, GLenum zfail, GLenum zpass); +GL_APICALL void GL_APIENTRY glStencilOpSeparate (GLenum face, GLenum fail, GLenum zfail, GLenum zpass); +GL_APICALL void GL_APIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid* pixels); +GL_APICALL void GL_APIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param); +GL_APICALL void GL_APIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat* params); +GL_APICALL void GL_APIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param); +GL_APICALL void GL_APIENTRY glTexParameteriv (GLenum target, GLenum pname, const GLint* params); +GL_APICALL void GL_APIENTRY glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid* pixels); +GL_APICALL void GL_APIENTRY glUniform1f (GLint location, GLfloat x); +GL_APICALL void GL_APIENTRY glUniform1fv (GLint location, GLsizei count, const GLfloat* v); +GL_APICALL void GL_APIENTRY glUniform1i (GLint location, GLint x); +GL_APICALL void GL_APIENTRY glUniform1iv (GLint location, GLsizei count, const GLint* v); +GL_APICALL void GL_APIENTRY glUniform2f (GLint location, GLfloat x, GLfloat y); +GL_APICALL void GL_APIENTRY glUniform2fv (GLint location, GLsizei count, const GLfloat* v); +GL_APICALL void GL_APIENTRY glUniform2i (GLint location, GLint x, GLint y); +GL_APICALL void GL_APIENTRY glUniform2iv (GLint location, GLsizei count, const GLint* v); +GL_APICALL void GL_APIENTRY glUniform3f (GLint location, GLfloat x, GLfloat y, GLfloat z); +GL_APICALL void GL_APIENTRY glUniform3fv (GLint location, GLsizei count, const GLfloat* v); +GL_APICALL void GL_APIENTRY glUniform3i (GLint location, GLint x, GLint y, GLint z); +GL_APICALL void GL_APIENTRY glUniform3iv (GLint location, GLsizei count, const GLint* v); +GL_APICALL void GL_APIENTRY glUniform4f (GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w); +GL_APICALL void GL_APIENTRY glUniform4fv (GLint location, GLsizei count, const GLfloat* v); +GL_APICALL void GL_APIENTRY glUniform4i (GLint location, GLint x, GLint y, GLint z, GLint w); +GL_APICALL void GL_APIENTRY glUniform4iv (GLint location, GLsizei count, const GLint* v); +GL_APICALL void GL_APIENTRY glUniformMatrix2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); +GL_APICALL void GL_APIENTRY glUniformMatrix3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); +GL_APICALL void GL_APIENTRY glUniformMatrix4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); +GL_APICALL void GL_APIENTRY glUseProgram (GLuint program); +GL_APICALL void GL_APIENTRY glValidateProgram (GLuint program); +GL_APICALL void GL_APIENTRY glVertexAttrib1f (GLuint indx, GLfloat x); +GL_APICALL void GL_APIENTRY glVertexAttrib1fv (GLuint indx, const GLfloat* values); +GL_APICALL void GL_APIENTRY glVertexAttrib2f (GLuint indx, GLfloat x, GLfloat y); +GL_APICALL void GL_APIENTRY glVertexAttrib2fv (GLuint indx, const GLfloat* values); +GL_APICALL void GL_APIENTRY glVertexAttrib3f (GLuint indx, GLfloat x, GLfloat y, GLfloat z); +GL_APICALL void GL_APIENTRY glVertexAttrib3fv (GLuint indx, const GLfloat* values); +GL_APICALL void GL_APIENTRY glVertexAttrib4f (GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w); +GL_APICALL void GL_APIENTRY glVertexAttrib4fv (GLuint indx, const GLfloat* values); +GL_APICALL void GL_APIENTRY glVertexAttribPointer (GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid* ptr); +GL_APICALL void GL_APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height); + +#ifdef __cplusplus +} +#endif + +#endif /* __gl2_h_ */ diff --git a/external/GLES2/gl2ext.h b/external/GLES2/gl2ext.h new file mode 100644 index 000000000..8df11d9f5 --- /dev/null +++ b/external/GLES2/gl2ext.h @@ -0,0 +1,1808 @@ +#ifndef __gl2ext_h_ +#define __gl2ext_h_ + +/* $Revision: 19436 $ on $Date:: 2012-10-10 10:37:04 -0700 #$ */ + +#ifdef __cplusplus +extern "C" { +#endif + +/* + * This document is licensed under the SGI Free Software B License Version + * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . + */ + +#ifndef GL_APIENTRYP +# define GL_APIENTRYP GL_APIENTRY* +#endif + +/*------------------------------------------------------------------------* + * OES extension tokens + *------------------------------------------------------------------------*/ + +/* GL_OES_compressed_ETC1_RGB8_texture */ +#ifndef GL_OES_compressed_ETC1_RGB8_texture +#define GL_ETC1_RGB8_OES 0x8D64 +#endif + +/* GL_OES_compressed_paletted_texture */ +#ifndef GL_OES_compressed_paletted_texture +#define GL_PALETTE4_RGB8_OES 0x8B90 +#define GL_PALETTE4_RGBA8_OES 0x8B91 +#define GL_PALETTE4_R5_G6_B5_OES 0x8B92 +#define GL_PALETTE4_RGBA4_OES 0x8B93 +#define GL_PALETTE4_RGB5_A1_OES 0x8B94 +#define GL_PALETTE8_RGB8_OES 0x8B95 +#define GL_PALETTE8_RGBA8_OES 0x8B96 +#define GL_PALETTE8_R5_G6_B5_OES 0x8B97 +#define GL_PALETTE8_RGBA4_OES 0x8B98 +#define GL_PALETTE8_RGB5_A1_OES 0x8B99 +#endif + +/* GL_OES_depth24 */ +#ifndef GL_OES_depth24 +#define GL_DEPTH_COMPONENT24_OES 0x81A6 +#endif + +/* GL_OES_depth32 */ +#ifndef GL_OES_depth32 +#define GL_DEPTH_COMPONENT32_OES 0x81A7 +#endif + +/* GL_OES_depth_texture */ +/* No new tokens introduced by this extension. */ + +/* GL_OES_EGL_image */ +#ifndef GL_OES_EGL_image +typedef void* GLeglImageOES; +#endif + +/* GL_OES_EGL_image_external */ +#ifndef GL_OES_EGL_image_external +/* GLeglImageOES defined in GL_OES_EGL_image already. */ +#define GL_TEXTURE_EXTERNAL_OES 0x8D65 +#define GL_SAMPLER_EXTERNAL_OES 0x8D66 +#define GL_TEXTURE_BINDING_EXTERNAL_OES 0x8D67 +#define GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES 0x8D68 +#endif + +/* GL_OES_element_index_uint */ +#ifndef GL_OES_element_index_uint +#define GL_UNSIGNED_INT 0x1405 +#endif + +/* GL_OES_get_program_binary */ +#ifndef GL_OES_get_program_binary +#define GL_PROGRAM_BINARY_LENGTH_OES 0x8741 +#define GL_NUM_PROGRAM_BINARY_FORMATS_OES 0x87FE +#define GL_PROGRAM_BINARY_FORMATS_OES 0x87FF +#endif + +/* GL_OES_mapbuffer */ +#ifndef GL_OES_mapbuffer +#define GL_WRITE_ONLY_OES 0x88B9 +#define GL_BUFFER_ACCESS_OES 0x88BB +#define GL_BUFFER_MAPPED_OES 0x88BC +#define GL_BUFFER_MAP_POINTER_OES 0x88BD +#endif + +/* GL_OES_packed_depth_stencil */ +#ifndef GL_OES_packed_depth_stencil +#define GL_DEPTH_STENCIL_OES 0x84F9 +#define GL_UNSIGNED_INT_24_8_OES 0x84FA +#define GL_DEPTH24_STENCIL8_OES 0x88F0 +#endif + +/* GL_OES_required_internalformat */ +#ifndef GL_OES_required_internalformat +#define GL_ALPHA8_OES 0x803C +#define GL_DEPTH_COMPONENT16_OES 0x81A5 +/* reuse GL_DEPTH_COMPONENT24_OES */ +/* reuse GL_DEPTH24_STENCIL8_OES */ +/* reuse GL_DEPTH_COMPONENT32_OES */ +#define GL_LUMINANCE4_ALPHA4_OES 0x8043 +#define GL_LUMINANCE8_ALPHA8_OES 0x8045 +#define GL_LUMINANCE8_OES 0x8040 +#define GL_RGBA4_OES 0x8056 +#define GL_RGB5_A1_OES 0x8057 +#define GL_RGB565_OES 0x8D62 +/* reuse GL_RGB8_OES */ +/* reuse GL_RGBA8_OES */ +/* reuse GL_RGB10_EXT */ +/* reuse GL_RGB10_A2_EXT */ +#endif + +/* GL_OES_rgb8_rgba8 */ +#ifndef GL_OES_rgb8_rgba8 +#define GL_RGB8_OES 0x8051 +#define GL_RGBA8_OES 0x8058 +#endif + +/* GL_OES_standard_derivatives */ +#ifndef GL_OES_standard_derivatives +#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES 0x8B8B +#endif + +/* GL_OES_stencil1 */ +#ifndef GL_OES_stencil1 +#define GL_STENCIL_INDEX1_OES 0x8D46 +#endif + +/* GL_OES_stencil4 */ +#ifndef GL_OES_stencil4 +#define GL_STENCIL_INDEX4_OES 0x8D47 +#endif + +#ifndef GL_OES_surfaceless_context +#define GL_FRAMEBUFFER_UNDEFINED_OES 0x8219 +#endif + +/* GL_OES_texture_3D */ +#ifndef GL_OES_texture_3D +#define GL_TEXTURE_WRAP_R_OES 0x8072 +#define GL_TEXTURE_3D_OES 0x806F +#define GL_TEXTURE_BINDING_3D_OES 0x806A +#define GL_MAX_3D_TEXTURE_SIZE_OES 0x8073 +#define GL_SAMPLER_3D_OES 0x8B5F +#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES 0x8CD4 +#endif + +/* GL_OES_texture_float */ +/* No new tokens introduced by this extension. */ + +/* GL_OES_texture_float_linear */ +/* No new tokens introduced by this extension. */ + +/* GL_OES_texture_half_float */ +#ifndef GL_OES_texture_half_float +#define GL_HALF_FLOAT_OES 0x8D61 +#endif + +/* GL_OES_texture_half_float_linear */ +/* No new tokens introduced by this extension. */ + +/* GL_OES_texture_npot */ +/* No new tokens introduced by this extension. */ + +/* GL_OES_vertex_array_object */ +#ifndef GL_OES_vertex_array_object +#define GL_VERTEX_ARRAY_BINDING_OES 0x85B5 +#endif + +/* GL_OES_vertex_half_float */ +/* GL_HALF_FLOAT_OES defined in GL_OES_texture_half_float already. */ + +/* GL_OES_vertex_type_10_10_10_2 */ +#ifndef GL_OES_vertex_type_10_10_10_2 +#define GL_UNSIGNED_INT_10_10_10_2_OES 0x8DF6 +#define GL_INT_10_10_10_2_OES 0x8DF7 +#endif + +/*------------------------------------------------------------------------* + * KHR extension tokens + *------------------------------------------------------------------------*/ + +#ifndef GL_KHR_debug +typedef void (GL_APIENTRYP GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam); +#define GL_DEBUG_OUTPUT_SYNCHRONOUS 0x8242 +#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243 +#define GL_DEBUG_CALLBACK_FUNCTION 0x8244 +#define GL_DEBUG_CALLBACK_USER_PARAM 0x8245 +#define GL_DEBUG_SOURCE_API 0x8246 +#define GL_DEBUG_SOURCE_WINDOW_SYSTEM 0x8247 +#define GL_DEBUG_SOURCE_SHADER_COMPILER 0x8248 +#define GL_DEBUG_SOURCE_THIRD_PARTY 0x8249 +#define GL_DEBUG_SOURCE_APPLICATION 0x824A +#define GL_DEBUG_SOURCE_OTHER 0x824B +#define GL_DEBUG_TYPE_ERROR 0x824C +#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D +#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR 0x824E +#define GL_DEBUG_TYPE_PORTABILITY 0x824F +#define GL_DEBUG_TYPE_PERFORMANCE 0x8250 +#define GL_DEBUG_TYPE_OTHER 0x8251 +#define GL_DEBUG_TYPE_MARKER 0x8268 +#define GL_DEBUG_TYPE_PUSH_GROUP 0x8269 +#define GL_DEBUG_TYPE_POP_GROUP 0x826A +#define GL_DEBUG_SEVERITY_NOTIFICATION 0x826B +#define GL_MAX_DEBUG_GROUP_STACK_DEPTH 0x826C +#define GL_DEBUG_GROUP_STACK_DEPTH 0x826D +#define GL_BUFFER 0x82E0 +#define GL_SHADER 0x82E1 +#define GL_PROGRAM 0x82E2 +#define GL_QUERY 0x82E3 +/* PROGRAM_PIPELINE only in GL */ +#define GL_SAMPLER 0x82E6 +/* DISPLAY_LIST only in GL */ +#define GL_MAX_LABEL_LENGTH 0x82E8 +#define GL_MAX_DEBUG_MESSAGE_LENGTH 0x9143 +#define GL_MAX_DEBUG_LOGGED_MESSAGES 0x9144 +#define GL_DEBUG_LOGGED_MESSAGES 0x9145 +#define GL_DEBUG_SEVERITY_HIGH 0x9146 +#define GL_DEBUG_SEVERITY_MEDIUM 0x9147 +#define GL_DEBUG_SEVERITY_LOW 0x9148 +#define GL_DEBUG_OUTPUT 0x92E0 +#define GL_CONTEXT_FLAG_DEBUG_BIT 0x00000002 +#define GL_STACK_OVERFLOW 0x0503 +#define GL_STACK_UNDERFLOW 0x0504 +#endif + +#ifndef GL_KHR_texture_compression_astc_ldr +#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR 0x93B0 +#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR 0x93B1 +#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR 0x93B2 +#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR 0x93B3 +#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR 0x93B4 +#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR 0x93B5 +#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR 0x93B6 +#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR 0x93B7 +#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR 0x93B8 +#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR 0x93B9 +#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR 0x93BA +#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR 0x93BB +#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR 0x93BC +#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR 0x93BD +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR 0x93D0 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR 0x93D1 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR 0x93D2 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR 0x93D3 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR 0x93D4 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR 0x93D5 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR 0x93D6 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR 0x93D7 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR 0x93D8 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR 0x93D9 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR 0x93DA +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR 0x93DB +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD +#endif + +/*------------------------------------------------------------------------* + * AMD extension tokens + *------------------------------------------------------------------------*/ + +/* GL_AMD_compressed_3DC_texture */ +#ifndef GL_AMD_compressed_3DC_texture +#define GL_3DC_X_AMD 0x87F9 +#define GL_3DC_XY_AMD 0x87FA +#endif + +/* GL_AMD_compressed_ATC_texture */ +#ifndef GL_AMD_compressed_ATC_texture +#define GL_ATC_RGB_AMD 0x8C92 +#define GL_ATC_RGBA_EXPLICIT_ALPHA_AMD 0x8C93 +#define GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD 0x87EE +#endif + +/* GL_AMD_performance_monitor */ +#ifndef GL_AMD_performance_monitor +#define GL_COUNTER_TYPE_AMD 0x8BC0 +#define GL_COUNTER_RANGE_AMD 0x8BC1 +#define GL_UNSIGNED_INT64_AMD 0x8BC2 +#define GL_PERCENTAGE_AMD 0x8BC3 +#define GL_PERFMON_RESULT_AVAILABLE_AMD 0x8BC4 +#define GL_PERFMON_RESULT_SIZE_AMD 0x8BC5 +#define GL_PERFMON_RESULT_AMD 0x8BC6 +#endif + +/* GL_AMD_program_binary_Z400 */ +#ifndef GL_AMD_program_binary_Z400 +#define GL_Z400_BINARY_AMD 0x8740 +#endif + +/*------------------------------------------------------------------------* + * ANGLE extension tokens + *------------------------------------------------------------------------*/ + +/* GL_ANGLE_framebuffer_blit */ +#ifndef GL_ANGLE_framebuffer_blit +#define GL_READ_FRAMEBUFFER_ANGLE 0x8CA8 +#define GL_DRAW_FRAMEBUFFER_ANGLE 0x8CA9 +#define GL_DRAW_FRAMEBUFFER_BINDING_ANGLE 0x8CA6 +#define GL_READ_FRAMEBUFFER_BINDING_ANGLE 0x8CAA +#endif + +/* GL_ANGLE_framebuffer_multisample */ +#ifndef GL_ANGLE_framebuffer_multisample +#define GL_RENDERBUFFER_SAMPLES_ANGLE 0x8CAB +#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_ANGLE 0x8D56 +#define GL_MAX_SAMPLES_ANGLE 0x8D57 +#endif + +/* GL_ANGLE_instanced_arrays */ +#ifndef GL_ANGLE_instanced_arrays +#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE 0x88FE +#endif + +/* GL_ANGLE_pack_reverse_row_order */ +#ifndef GL_ANGLE_pack_reverse_row_order +#define GL_PACK_REVERSE_ROW_ORDER_ANGLE 0x93A4 +#endif + +/* GL_ANGLE_texture_compression_dxt3 */ +#ifndef GL_ANGLE_texture_compression_dxt3 +#define GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE 0x83F2 +#endif + +/* GL_ANGLE_texture_compression_dxt5 */ +#ifndef GL_ANGLE_texture_compression_dxt5 +#define GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE 0x83F3 +#endif + +/* GL_ANGLE_texture_usage */ +#ifndef GL_ANGLE_texture_usage +#define GL_TEXTURE_USAGE_ANGLE 0x93A2 +#define GL_FRAMEBUFFER_ATTACHMENT_ANGLE 0x93A3 +#endif + +/* GL_ANGLE_translated_shader_source */ +#ifndef GL_ANGLE_translated_shader_source +#define GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE 0x93A0 +#endif + +/*------------------------------------------------------------------------* + * APPLE extension tokens + *------------------------------------------------------------------------*/ + +/* GL_APPLE_copy_texture_levels */ +/* No new tokens introduced by this extension. */ + +/* GL_APPLE_framebuffer_multisample */ +#ifndef GL_APPLE_framebuffer_multisample +#define GL_RENDERBUFFER_SAMPLES_APPLE 0x8CAB +#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_APPLE 0x8D56 +#define GL_MAX_SAMPLES_APPLE 0x8D57 +#define GL_READ_FRAMEBUFFER_APPLE 0x8CA8 +#define GL_DRAW_FRAMEBUFFER_APPLE 0x8CA9 +#define GL_DRAW_FRAMEBUFFER_BINDING_APPLE 0x8CA6 +#define GL_READ_FRAMEBUFFER_BINDING_APPLE 0x8CAA +#endif + +/* GL_APPLE_rgb_422 */ +#ifndef GL_APPLE_rgb_422 +#define GL_RGB_422_APPLE 0x8A1F +#define GL_UNSIGNED_SHORT_8_8_APPLE 0x85BA +#define GL_UNSIGNED_SHORT_8_8_REV_APPLE 0x85BB +#endif + +/* GL_APPLE_sync */ +#ifndef GL_APPLE_sync + +#ifndef __gl3_h_ +/* These types are defined with reference to + * in the Apple extension spec, but here we use the Khronos + * portable types in khrplatform.h, and assume those types + * are always defined. + * If any other extensions using these types are defined, + * the typedefs must move out of this block and be shared. + */ +typedef khronos_int64_t GLint64; +typedef khronos_uint64_t GLuint64; +typedef struct __GLsync *GLsync; +#endif + +#define GL_SYNC_OBJECT_APPLE 0x8A53 +#define GL_MAX_SERVER_WAIT_TIMEOUT_APPLE 0x9111 +#define GL_OBJECT_TYPE_APPLE 0x9112 +#define GL_SYNC_CONDITION_APPLE 0x9113 +#define GL_SYNC_STATUS_APPLE 0x9114 +#define GL_SYNC_FLAGS_APPLE 0x9115 +#define GL_SYNC_FENCE_APPLE 0x9116 +#define GL_SYNC_GPU_COMMANDS_COMPLETE_APPLE 0x9117 +#define GL_UNSIGNALED_APPLE 0x9118 +#define GL_SIGNALED_APPLE 0x9119 +#define GL_ALREADY_SIGNALED_APPLE 0x911A +#define GL_TIMEOUT_EXPIRED_APPLE 0x911B +#define GL_CONDITION_SATISFIED_APPLE 0x911C +#define GL_WAIT_FAILED_APPLE 0x911D +#define GL_SYNC_FLUSH_COMMANDS_BIT_APPLE 0x00000001 +#define GL_TIMEOUT_IGNORED_APPLE 0xFFFFFFFFFFFFFFFFull +#endif + +/* GL_APPLE_texture_format_BGRA8888 */ +#ifndef GL_APPLE_texture_format_BGRA8888 +#define GL_BGRA_EXT 0x80E1 +#endif + +/* GL_APPLE_texture_max_level */ +#ifndef GL_APPLE_texture_max_level +#define GL_TEXTURE_MAX_LEVEL_APPLE 0x813D +#endif + +/*------------------------------------------------------------------------* + * ARM extension tokens + *------------------------------------------------------------------------*/ + +/* GL_ARM_mali_program_binary */ +#ifndef GL_ARM_mali_program_binary +#define GL_MALI_PROGRAM_BINARY_ARM 0x8F61 +#endif + +/* GL_ARM_mali_shader_binary */ +#ifndef GL_ARM_mali_shader_binary +#define GL_MALI_SHADER_BINARY_ARM 0x8F60 +#endif + +/* GL_ARM_rgba8 */ +/* No new tokens introduced by this extension. */ + +/*------------------------------------------------------------------------* + * EXT extension tokens + *------------------------------------------------------------------------*/ + +/* GL_EXT_blend_minmax */ +#ifndef GL_EXT_blend_minmax +#define GL_MIN_EXT 0x8007 +#define GL_MAX_EXT 0x8008 +#endif + +/* GL_EXT_color_buffer_half_float */ +#ifndef GL_EXT_color_buffer_half_float +#define GL_RGBA16F_EXT 0x881A +#define GL_RGB16F_EXT 0x881B +#define GL_RG16F_EXT 0x822F +#define GL_R16F_EXT 0x822D +#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT 0x8211 +#define GL_UNSIGNED_NORMALIZED_EXT 0x8C17 +#endif + +/* GL_EXT_debug_label */ +#ifndef GL_EXT_debug_label +#define GL_PROGRAM_PIPELINE_OBJECT_EXT 0x8A4F +#define GL_PROGRAM_OBJECT_EXT 0x8B40 +#define GL_SHADER_OBJECT_EXT 0x8B48 +#define GL_BUFFER_OBJECT_EXT 0x9151 +#define GL_QUERY_OBJECT_EXT 0x9153 +#define GL_VERTEX_ARRAY_OBJECT_EXT 0x9154 +#endif + +/* GL_EXT_debug_marker */ +/* No new tokens introduced by this extension. */ + +/* GL_EXT_discard_framebuffer */ +#ifndef GL_EXT_discard_framebuffer +#define GL_COLOR_EXT 0x1800 +#define GL_DEPTH_EXT 0x1801 +#define GL_STENCIL_EXT 0x1802 +#endif + +/* GL_EXT_map_buffer_range */ +#ifndef GL_EXT_map_buffer_range +#define GL_MAP_READ_BIT_EXT 0x0001 +#define GL_MAP_WRITE_BIT_EXT 0x0002 +#define GL_MAP_INVALIDATE_RANGE_BIT_EXT 0x0004 +#define GL_MAP_INVALIDATE_BUFFER_BIT_EXT 0x0008 +#define GL_MAP_FLUSH_EXPLICIT_BIT_EXT 0x0010 +#define GL_MAP_UNSYNCHRONIZED_BIT_EXT 0x0020 +#endif + +/* GL_EXT_multisampled_render_to_texture */ +#ifndef GL_EXT_multisampled_render_to_texture +#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT 0x8D6C +/* reuse values from GL_EXT_framebuffer_multisample (desktop extension) */ +#define GL_RENDERBUFFER_SAMPLES_EXT 0x8CAB +#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56 +#define GL_MAX_SAMPLES_EXT 0x8D57 +#endif + +/* GL_EXT_multiview_draw_buffers */ +#ifndef GL_EXT_multiview_draw_buffers +#define GL_COLOR_ATTACHMENT_EXT 0x90F0 +#define GL_MULTIVIEW_EXT 0x90F1 +#define GL_DRAW_BUFFER_EXT 0x0C01 +#define GL_READ_BUFFER_EXT 0x0C02 +#define GL_MAX_MULTIVIEW_BUFFERS_EXT 0x90F2 +#endif + +/* GL_EXT_multi_draw_arrays */ +/* No new tokens introduced by this extension. */ + +/* GL_EXT_occlusion_query_boolean */ +#ifndef GL_EXT_occlusion_query_boolean +#define GL_ANY_SAMPLES_PASSED_EXT 0x8C2F +#define GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT 0x8D6A +#define GL_CURRENT_QUERY_EXT 0x8865 +#define GL_QUERY_RESULT_EXT 0x8866 +#define GL_QUERY_RESULT_AVAILABLE_EXT 0x8867 +#endif + +/* GL_EXT_read_format_bgra */ +#ifndef GL_EXT_read_format_bgra +#define GL_BGRA_EXT 0x80E1 +#define GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT 0x8365 +#define GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT 0x8366 +#endif + +/* GL_EXT_robustness */ +#ifndef GL_EXT_robustness +/* reuse GL_NO_ERROR */ +#define GL_GUILTY_CONTEXT_RESET_EXT 0x8253 +#define GL_INNOCENT_CONTEXT_RESET_EXT 0x8254 +#define GL_UNKNOWN_CONTEXT_RESET_EXT 0x8255 +#define GL_CONTEXT_ROBUST_ACCESS_EXT 0x90F3 +#define GL_RESET_NOTIFICATION_STRATEGY_EXT 0x8256 +#define GL_LOSE_CONTEXT_ON_RESET_EXT 0x8252 +#define GL_NO_RESET_NOTIFICATION_EXT 0x8261 +#endif + +/* GL_EXT_separate_shader_objects */ +#ifndef GL_EXT_separate_shader_objects +#define GL_VERTEX_SHADER_BIT_EXT 0x00000001 +#define GL_FRAGMENT_SHADER_BIT_EXT 0x00000002 +#define GL_ALL_SHADER_BITS_EXT 0xFFFFFFFF +#define GL_PROGRAM_SEPARABLE_EXT 0x8258 +#define GL_ACTIVE_PROGRAM_EXT 0x8259 +#define GL_PROGRAM_PIPELINE_BINDING_EXT 0x825A +#endif + +/* GL_EXT_shader_framebuffer_fetch */ +#ifndef GL_EXT_shader_framebuffer_fetch +#define GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT 0x8A52 +#endif + +/* GL_EXT_shader_texture_lod */ +/* No new tokens introduced by this extension. */ + +/* GL_EXT_shadow_samplers */ +#ifndef GL_EXT_shadow_samplers +#define GL_TEXTURE_COMPARE_MODE_EXT 0x884C +#define GL_TEXTURE_COMPARE_FUNC_EXT 0x884D +#define GL_COMPARE_REF_TO_TEXTURE_EXT 0x884E +#define GL_SAMPLER_2D_SHADOW_EXT 0x8B62 +#endif + +/* GL_EXT_sRGB */ +#ifndef GL_EXT_sRGB +#define GL_SRGB_EXT 0x8C40 +#define GL_SRGB_ALPHA_EXT 0x8C42 +#define GL_SRGB8_ALPHA8_EXT 0x8C43 +#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT 0x8210 +#endif + +/* GL_EXT_texture_compression_dxt1 */ +#ifndef GL_EXT_texture_compression_dxt1 +#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0 +#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1 +#endif + +/* GL_EXT_texture_filter_anisotropic */ +#ifndef GL_EXT_texture_filter_anisotropic +#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE +#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF +#endif + +/* GL_EXT_texture_format_BGRA8888 */ +#ifndef GL_EXT_texture_format_BGRA8888 +#define GL_BGRA_EXT 0x80E1 +#endif + +/* GL_EXT_texture_rg */ +#ifndef GL_EXT_texture_rg +#define GL_RED_EXT 0x1903 +#define GL_RG_EXT 0x8227 +#define GL_R8_EXT 0x8229 +#define GL_RG8_EXT 0x822B +#endif + +/* GL_EXT_texture_storage */ +#ifndef GL_EXT_texture_storage +#define GL_TEXTURE_IMMUTABLE_FORMAT_EXT 0x912F +#define GL_ALPHA8_EXT 0x803C +#define GL_LUMINANCE8_EXT 0x8040 +#define GL_LUMINANCE8_ALPHA8_EXT 0x8045 +#define GL_RGBA32F_EXT 0x8814 +#define GL_RGB32F_EXT 0x8815 +#define GL_ALPHA32F_EXT 0x8816 +#define GL_LUMINANCE32F_EXT 0x8818 +#define GL_LUMINANCE_ALPHA32F_EXT 0x8819 +/* reuse GL_RGBA16F_EXT */ +/* reuse GL_RGB16F_EXT */ +#define GL_ALPHA16F_EXT 0x881C +#define GL_LUMINANCE16F_EXT 0x881E +#define GL_LUMINANCE_ALPHA16F_EXT 0x881F +#define GL_RGB10_A2_EXT 0x8059 +#define GL_RGB10_EXT 0x8052 +#define GL_BGRA8_EXT 0x93A1 +#define GL_R8_EXT 0x8229 +#define GL_RG8_EXT 0x822B +#define GL_R32F_EXT 0x822E +#define GL_RG32F_EXT 0x8230 +#define GL_R16F_EXT 0x822D +#define GL_RG16F_EXT 0x822F +#endif + +/* GL_EXT_texture_type_2_10_10_10_REV */ +#ifndef GL_EXT_texture_type_2_10_10_10_REV +#define GL_UNSIGNED_INT_2_10_10_10_REV_EXT 0x8368 +#endif + +/* GL_EXT_unpack_subimage */ +#ifndef GL_EXT_unpack_subimage +#define GL_UNPACK_ROW_LENGTH 0x0CF2 +#define GL_UNPACK_SKIP_ROWS 0x0CF3 +#define GL_UNPACK_SKIP_PIXELS 0x0CF4 +#endif + +/*------------------------------------------------------------------------* + * DMP extension tokens + *------------------------------------------------------------------------*/ + +/* GL_DMP_shader_binary */ +#ifndef GL_DMP_shader_binary +#define GL_SHADER_BINARY_DMP 0x9250 +#endif + +/*------------------------------------------------------------------------* + * FJ extension tokens + *------------------------------------------------------------------------*/ + +/* GL_FJ_shader_binary_GCCSO */ +#ifndef GL_FJ_shader_binary_GCCSO +#define GCCSO_SHADER_BINARY_FJ 0x9260 +#endif + +/*------------------------------------------------------------------------* + * IMG extension tokens + *------------------------------------------------------------------------*/ + +/* GL_IMG_program_binary */ +#ifndef GL_IMG_program_binary +#define GL_SGX_PROGRAM_BINARY_IMG 0x9130 +#endif + +/* GL_IMG_read_format */ +#ifndef GL_IMG_read_format +#define GL_BGRA_IMG 0x80E1 +#define GL_UNSIGNED_SHORT_4_4_4_4_REV_IMG 0x8365 +#endif + +/* GL_IMG_shader_binary */ +#ifndef GL_IMG_shader_binary +#define GL_SGX_BINARY_IMG 0x8C0A +#endif + +/* GL_IMG_texture_compression_pvrtc */ +#ifndef GL_IMG_texture_compression_pvrtc +#define GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG 0x8C00 +#define GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG 0x8C01 +#define GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG 0x8C02 +#define GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG 0x8C03 +#endif + +/* GL_IMG_multisampled_render_to_texture */ +#ifndef GL_IMG_multisampled_render_to_texture +#define GL_RENDERBUFFER_SAMPLES_IMG 0x9133 +#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_IMG 0x9134 +#define GL_MAX_SAMPLES_IMG 0x9135 +#define GL_TEXTURE_SAMPLES_IMG 0x9136 +#endif + +/*------------------------------------------------------------------------* + * NV extension tokens + *------------------------------------------------------------------------*/ + +/* GL_NV_coverage_sample */ +#ifndef GL_NV_coverage_sample +#define GL_COVERAGE_COMPONENT_NV 0x8ED0 +#define GL_COVERAGE_COMPONENT4_NV 0x8ED1 +#define GL_COVERAGE_ATTACHMENT_NV 0x8ED2 +#define GL_COVERAGE_BUFFERS_NV 0x8ED3 +#define GL_COVERAGE_SAMPLES_NV 0x8ED4 +#define GL_COVERAGE_ALL_FRAGMENTS_NV 0x8ED5 +#define GL_COVERAGE_EDGE_FRAGMENTS_NV 0x8ED6 +#define GL_COVERAGE_AUTOMATIC_NV 0x8ED7 +#define GL_COVERAGE_BUFFER_BIT_NV 0x8000 +#endif + +/* GL_NV_depth_nonlinear */ +#ifndef GL_NV_depth_nonlinear +#define GL_DEPTH_COMPONENT16_NONLINEAR_NV 0x8E2C +#endif + +/* GL_NV_draw_buffers */ +#ifndef GL_NV_draw_buffers +#define GL_MAX_DRAW_BUFFERS_NV 0x8824 +#define GL_DRAW_BUFFER0_NV 0x8825 +#define GL_DRAW_BUFFER1_NV 0x8826 +#define GL_DRAW_BUFFER2_NV 0x8827 +#define GL_DRAW_BUFFER3_NV 0x8828 +#define GL_DRAW_BUFFER4_NV 0x8829 +#define GL_DRAW_BUFFER5_NV 0x882A +#define GL_DRAW_BUFFER6_NV 0x882B +#define GL_DRAW_BUFFER7_NV 0x882C +#define GL_DRAW_BUFFER8_NV 0x882D +#define GL_DRAW_BUFFER9_NV 0x882E +#define GL_DRAW_BUFFER10_NV 0x882F +#define GL_DRAW_BUFFER11_NV 0x8830 +#define GL_DRAW_BUFFER12_NV 0x8831 +#define GL_DRAW_BUFFER13_NV 0x8832 +#define GL_DRAW_BUFFER14_NV 0x8833 +#define GL_DRAW_BUFFER15_NV 0x8834 +#define GL_COLOR_ATTACHMENT0_NV 0x8CE0 +#define GL_COLOR_ATTACHMENT1_NV 0x8CE1 +#define GL_COLOR_ATTACHMENT2_NV 0x8CE2 +#define GL_COLOR_ATTACHMENT3_NV 0x8CE3 +#define GL_COLOR_ATTACHMENT4_NV 0x8CE4 +#define GL_COLOR_ATTACHMENT5_NV 0x8CE5 +#define GL_COLOR_ATTACHMENT6_NV 0x8CE6 +#define GL_COLOR_ATTACHMENT7_NV 0x8CE7 +#define GL_COLOR_ATTACHMENT8_NV 0x8CE8 +#define GL_COLOR_ATTACHMENT9_NV 0x8CE9 +#define GL_COLOR_ATTACHMENT10_NV 0x8CEA +#define GL_COLOR_ATTACHMENT11_NV 0x8CEB +#define GL_COLOR_ATTACHMENT12_NV 0x8CEC +#define GL_COLOR_ATTACHMENT13_NV 0x8CED +#define GL_COLOR_ATTACHMENT14_NV 0x8CEE +#define GL_COLOR_ATTACHMENT15_NV 0x8CEF +#endif + +/* GL_NV_fbo_color_attachments */ +#ifndef GL_NV_fbo_color_attachments +#define GL_MAX_COLOR_ATTACHMENTS_NV 0x8CDF +/* GL_COLOR_ATTACHMENT{0-15}_NV defined in GL_NV_draw_buffers already. */ +#endif + +/* GL_NV_fence */ +#ifndef GL_NV_fence +#define GL_ALL_COMPLETED_NV 0x84F2 +#define GL_FENCE_STATUS_NV 0x84F3 +#define GL_FENCE_CONDITION_NV 0x84F4 +#endif + +/* GL_NV_read_buffer */ +#ifndef GL_NV_read_buffer +#define GL_READ_BUFFER_NV 0x0C02 +#endif + +/* GL_NV_read_buffer_front */ +/* No new tokens introduced by this extension. */ + +/* GL_NV_read_depth */ +/* No new tokens introduced by this extension. */ + +/* GL_NV_read_depth_stencil */ +/* No new tokens introduced by this extension. */ + +/* GL_NV_read_stencil */ +/* No new tokens introduced by this extension. */ + +/* GL_NV_texture_compression_s3tc_update */ +/* No new tokens introduced by this extension. */ + +/* GL_NV_texture_npot_2D_mipmap */ +/* No new tokens introduced by this extension. */ + +/*------------------------------------------------------------------------* + * QCOM extension tokens + *------------------------------------------------------------------------*/ + +/* GL_QCOM_alpha_test */ +#ifndef GL_QCOM_alpha_test +#define GL_ALPHA_TEST_QCOM 0x0BC0 +#define GL_ALPHA_TEST_FUNC_QCOM 0x0BC1 +#define GL_ALPHA_TEST_REF_QCOM 0x0BC2 +#endif + +/* GL_QCOM_binning_control */ +#ifndef GL_QCOM_binning_control +#define GL_BINNING_CONTROL_HINT_QCOM 0x8FB0 +#define GL_CPU_OPTIMIZED_QCOM 0x8FB1 +#define GL_GPU_OPTIMIZED_QCOM 0x8FB2 +#define GL_RENDER_DIRECT_TO_FRAMEBUFFER_QCOM 0x8FB3 +#endif + +/* GL_QCOM_driver_control */ +/* No new tokens introduced by this extension. */ + +/* GL_QCOM_extended_get */ +#ifndef GL_QCOM_extended_get +#define GL_TEXTURE_WIDTH_QCOM 0x8BD2 +#define GL_TEXTURE_HEIGHT_QCOM 0x8BD3 +#define GL_TEXTURE_DEPTH_QCOM 0x8BD4 +#define GL_TEXTURE_INTERNAL_FORMAT_QCOM 0x8BD5 +#define GL_TEXTURE_FORMAT_QCOM 0x8BD6 +#define GL_TEXTURE_TYPE_QCOM 0x8BD7 +#define GL_TEXTURE_IMAGE_VALID_QCOM 0x8BD8 +#define GL_TEXTURE_NUM_LEVELS_QCOM 0x8BD9 +#define GL_TEXTURE_TARGET_QCOM 0x8BDA +#define GL_TEXTURE_OBJECT_VALID_QCOM 0x8BDB +#define GL_STATE_RESTORE 0x8BDC +#endif + +/* GL_QCOM_extended_get2 */ +/* No new tokens introduced by this extension. */ + +/* GL_QCOM_perfmon_global_mode */ +#ifndef GL_QCOM_perfmon_global_mode +#define GL_PERFMON_GLOBAL_MODE_QCOM 0x8FA0 +#endif + +/* GL_QCOM_writeonly_rendering */ +#ifndef GL_QCOM_writeonly_rendering +#define GL_WRITEONLY_RENDERING_QCOM 0x8823 +#endif + +/* GL_QCOM_tiled_rendering */ +#ifndef GL_QCOM_tiled_rendering +#define GL_COLOR_BUFFER_BIT0_QCOM 0x00000001 +#define GL_COLOR_BUFFER_BIT1_QCOM 0x00000002 +#define GL_COLOR_BUFFER_BIT2_QCOM 0x00000004 +#define GL_COLOR_BUFFER_BIT3_QCOM 0x00000008 +#define GL_COLOR_BUFFER_BIT4_QCOM 0x00000010 +#define GL_COLOR_BUFFER_BIT5_QCOM 0x00000020 +#define GL_COLOR_BUFFER_BIT6_QCOM 0x00000040 +#define GL_COLOR_BUFFER_BIT7_QCOM 0x00000080 +#define GL_DEPTH_BUFFER_BIT0_QCOM 0x00000100 +#define GL_DEPTH_BUFFER_BIT1_QCOM 0x00000200 +#define GL_DEPTH_BUFFER_BIT2_QCOM 0x00000400 +#define GL_DEPTH_BUFFER_BIT3_QCOM 0x00000800 +#define GL_DEPTH_BUFFER_BIT4_QCOM 0x00001000 +#define GL_DEPTH_BUFFER_BIT5_QCOM 0x00002000 +#define GL_DEPTH_BUFFER_BIT6_QCOM 0x00004000 +#define GL_DEPTH_BUFFER_BIT7_QCOM 0x00008000 +#define GL_STENCIL_BUFFER_BIT0_QCOM 0x00010000 +#define GL_STENCIL_BUFFER_BIT1_QCOM 0x00020000 +#define GL_STENCIL_BUFFER_BIT2_QCOM 0x00040000 +#define GL_STENCIL_BUFFER_BIT3_QCOM 0x00080000 +#define GL_STENCIL_BUFFER_BIT4_QCOM 0x00100000 +#define GL_STENCIL_BUFFER_BIT5_QCOM 0x00200000 +#define GL_STENCIL_BUFFER_BIT6_QCOM 0x00400000 +#define GL_STENCIL_BUFFER_BIT7_QCOM 0x00800000 +#define GL_MULTISAMPLE_BUFFER_BIT0_QCOM 0x01000000 +#define GL_MULTISAMPLE_BUFFER_BIT1_QCOM 0x02000000 +#define GL_MULTISAMPLE_BUFFER_BIT2_QCOM 0x04000000 +#define GL_MULTISAMPLE_BUFFER_BIT3_QCOM 0x08000000 +#define GL_MULTISAMPLE_BUFFER_BIT4_QCOM 0x10000000 +#define GL_MULTISAMPLE_BUFFER_BIT5_QCOM 0x20000000 +#define GL_MULTISAMPLE_BUFFER_BIT6_QCOM 0x40000000 +#define GL_MULTISAMPLE_BUFFER_BIT7_QCOM 0x80000000 +#endif + +/*------------------------------------------------------------------------* + * VIV extension tokens + *------------------------------------------------------------------------*/ + +/* GL_VIV_shader_binary */ +#ifndef GL_VIV_shader_binary +#define GL_SHADER_BINARY_VIV 0x8FC4 +#endif + +/*------------------------------------------------------------------------* + * End of extension tokens, start of corresponding extension functions + *------------------------------------------------------------------------*/ + +/*------------------------------------------------------------------------* + * OES extension functions + *------------------------------------------------------------------------*/ + +/* GL_OES_compressed_ETC1_RGB8_texture */ +#ifndef GL_OES_compressed_ETC1_RGB8_texture +#define GL_OES_compressed_ETC1_RGB8_texture 1 +#endif + +/* GL_OES_compressed_paletted_texture */ +#ifndef GL_OES_compressed_paletted_texture +#define GL_OES_compressed_paletted_texture 1 +#endif + +/* GL_OES_depth24 */ +#ifndef GL_OES_depth24 +#define GL_OES_depth24 1 +#endif + +/* GL_OES_depth32 */ +#ifndef GL_OES_depth32 +#define GL_OES_depth32 1 +#endif + +/* GL_OES_depth_texture */ +#ifndef GL_OES_depth_texture +#define GL_OES_depth_texture 1 +#endif + +/* GL_OES_EGL_image */ +#ifndef GL_OES_EGL_image +#define GL_OES_EGL_image 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glEGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image); +GL_APICALL void GL_APIENTRY glEGLImageTargetRenderbufferStorageOES (GLenum target, GLeglImageOES image); +#endif +typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image); +typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum target, GLeglImageOES image); +#endif + +/* GL_OES_EGL_image_external */ +#ifndef GL_OES_EGL_image_external +#define GL_OES_EGL_image_external 1 +/* glEGLImageTargetTexture2DOES defined in GL_OES_EGL_image already. */ +#endif + +/* GL_OES_element_index_uint */ +#ifndef GL_OES_element_index_uint +#define GL_OES_element_index_uint 1 +#endif + +/* GL_OES_fbo_render_mipmap */ +#ifndef GL_OES_fbo_render_mipmap +#define GL_OES_fbo_render_mipmap 1 +#endif + +/* GL_OES_fragment_precision_high */ +#ifndef GL_OES_fragment_precision_high +#define GL_OES_fragment_precision_high 1 +#endif + +/* GL_OES_get_program_binary */ +#ifndef GL_OES_get_program_binary +#define GL_OES_get_program_binary 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glGetProgramBinaryOES (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary); +GL_APICALL void GL_APIENTRY glProgramBinaryOES (GLuint program, GLenum binaryFormat, const GLvoid *binary, GLint length); +#endif +typedef void (GL_APIENTRYP PFNGLGETPROGRAMBINARYOESPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary); +typedef void (GL_APIENTRYP PFNGLPROGRAMBINARYOESPROC) (GLuint program, GLenum binaryFormat, const GLvoid *binary, GLint length); +#endif + +/* GL_OES_mapbuffer */ +#ifndef GL_OES_mapbuffer +#define GL_OES_mapbuffer 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void* GL_APIENTRY glMapBufferOES (GLenum target, GLenum access); +GL_APICALL GLboolean GL_APIENTRY glUnmapBufferOES (GLenum target); +GL_APICALL void GL_APIENTRY glGetBufferPointervOES (GLenum target, GLenum pname, GLvoid** params); +#endif +typedef void* (GL_APIENTRYP PFNGLMAPBUFFEROESPROC) (GLenum target, GLenum access); +typedef GLboolean (GL_APIENTRYP PFNGLUNMAPBUFFEROESPROC) (GLenum target); +typedef void (GL_APIENTRYP PFNGLGETBUFFERPOINTERVOESPROC) (GLenum target, GLenum pname, GLvoid** params); +#endif + +/* GL_OES_packed_depth_stencil */ +#ifndef GL_OES_packed_depth_stencil +#define GL_OES_packed_depth_stencil 1 +#endif + +/* GL_OES_required_internalformat */ +#ifndef GL_OES_required_internalformat +#define GL_OES_required_internalformat 1 +#endif + +/* GL_OES_rgb8_rgba8 */ +#ifndef GL_OES_rgb8_rgba8 +#define GL_OES_rgb8_rgba8 1 +#endif + +/* GL_OES_standard_derivatives */ +#ifndef GL_OES_standard_derivatives +#define GL_OES_standard_derivatives 1 +#endif + +/* GL_OES_stencil1 */ +#ifndef GL_OES_stencil1 +#define GL_OES_stencil1 1 +#endif + +/* GL_OES_stencil4 */ +#ifndef GL_OES_stencil4 +#define GL_OES_stencil4 1 +#endif + +#ifndef GL_OES_surfaceless_context +#define GL_OES_surfaceless_context 1 +#endif + +/* GL_OES_texture_3D */ +#ifndef GL_OES_texture_3D +#define GL_OES_texture_3D 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glTexImage3DOES (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels); +GL_APICALL void GL_APIENTRY glTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels); +GL_APICALL void GL_APIENTRY glCopyTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); +GL_APICALL void GL_APIENTRY glCompressedTexImage3DOES (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid* data); +GL_APICALL void GL_APIENTRY glCompressedTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid* data); +GL_APICALL void GL_APIENTRY glFramebufferTexture3DOES (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); +#endif +typedef void (GL_APIENTRYP PFNGLTEXIMAGE3DOESPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels); +typedef void (GL_APIENTRYP PFNGLTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels); +typedef void (GL_APIENTRYP PFNGLCOPYTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); +typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DOESPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid* data); +typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid* data); +typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DOES) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); +#endif + +/* GL_OES_texture_float */ +#ifndef GL_OES_texture_float +#define GL_OES_texture_float 1 +#endif + +/* GL_OES_texture_float_linear */ +#ifndef GL_OES_texture_float_linear +#define GL_OES_texture_float_linear 1 +#endif + +/* GL_OES_texture_half_float */ +#ifndef GL_OES_texture_half_float +#define GL_OES_texture_half_float 1 +#endif + +/* GL_OES_texture_half_float_linear */ +#ifndef GL_OES_texture_half_float_linear +#define GL_OES_texture_half_float_linear 1 +#endif + +/* GL_OES_texture_npot */ +#ifndef GL_OES_texture_npot +#define GL_OES_texture_npot 1 +#endif + +/* GL_OES_vertex_array_object */ +#ifndef GL_OES_vertex_array_object +#define GL_OES_vertex_array_object 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glBindVertexArrayOES (GLuint array); +GL_APICALL void GL_APIENTRY glDeleteVertexArraysOES (GLsizei n, const GLuint *arrays); +GL_APICALL void GL_APIENTRY glGenVertexArraysOES (GLsizei n, GLuint *arrays); +GL_APICALL GLboolean GL_APIENTRY glIsVertexArrayOES (GLuint array); +#endif +typedef void (GL_APIENTRYP PFNGLBINDVERTEXARRAYOESPROC) (GLuint array); +typedef void (GL_APIENTRYP PFNGLDELETEVERTEXARRAYSOESPROC) (GLsizei n, const GLuint *arrays); +typedef void (GL_APIENTRYP PFNGLGENVERTEXARRAYSOESPROC) (GLsizei n, GLuint *arrays); +typedef GLboolean (GL_APIENTRYP PFNGLISVERTEXARRAYOESPROC) (GLuint array); +#endif + +/* GL_OES_vertex_half_float */ +#ifndef GL_OES_vertex_half_float +#define GL_OES_vertex_half_float 1 +#endif + +/* GL_OES_vertex_type_10_10_10_2 */ +#ifndef GL_OES_vertex_type_10_10_10_2 +#define GL_OES_vertex_type_10_10_10_2 1 +#endif + +/*------------------------------------------------------------------------* + * KHR extension functions + *------------------------------------------------------------------------*/ + +#ifndef GL_KHR_debug +#define GL_KHR_debug 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glDebugMessageControl (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); +GL_APICALL void GL_APIENTRY glDebugMessageInsert (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf); +GL_APICALL void GL_APIENTRY glDebugMessageCallback (GLDEBUGPROC callback, const void *userParam); +GL_APICALL GLuint GL_APIENTRY glGetDebugMessageLog (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog); +GL_APICALL void GL_APIENTRY glPushDebugGroup (GLenum source, GLuint id, GLsizei length, const GLchar *message); +GL_APICALL void GL_APIENTRY glPopDebugGroup (void); +GL_APICALL void GL_APIENTRY glObjectLabel (GLenum identifier, GLuint name, GLsizei length, const GLchar *label); +GL_APICALL void GL_APIENTRY glGetObjectLabel (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label); +GL_APICALL void GL_APIENTRY glObjectPtrLabel (const void *ptr, GLsizei length, const GLchar *label); +GL_APICALL void GL_APIENTRY glGetObjectPtrLabel (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label); +GL_APICALL void GL_APIENTRY glGetPointerv (GLenum pname, void **params); +#endif +typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGECONTROLPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); +typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGEINSERTPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf); +typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGECALLBACKPROC) (GLDEBUGPROC callback, const void *userParam); +typedef GLuint (GL_APIENTRYP PFNGLGETDEBUGMESSAGELOGPROC) (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog); +typedef void (GL_APIENTRYP PFNGLPUSHDEBUGGROUPPROC) (GLenum source, GLuint id, GLsizei length, const GLchar *message); +typedef void (GL_APIENTRYP PFNGLPOPDEBUGGROUPPROC) (void); +typedef void (GL_APIENTRYP PFNGLOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei length, const GLchar *label); +typedef void (GL_APIENTRYP PFNGLGETOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label); +typedef void (GL_APIENTRYP PFNGLOBJECTPTRLABELPROC) (const void *ptr, GLsizei length, const GLchar *label); +typedef void (GL_APIENTRYP PFNGLGETOBJECTPTRLABELPROC) (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label); +typedef void (GL_APIENTRYP PFNGLGETPOINTERVPROC) (GLenum pname, void **params); +#endif + +#ifndef GL_KHR_texture_compression_astc_ldr +#define GL_KHR_texture_compression_astc_ldr 1 +#endif + + +/*------------------------------------------------------------------------* + * AMD extension functions + *------------------------------------------------------------------------*/ + +/* GL_AMD_compressed_3DC_texture */ +#ifndef GL_AMD_compressed_3DC_texture +#define GL_AMD_compressed_3DC_texture 1 +#endif + +/* GL_AMD_compressed_ATC_texture */ +#ifndef GL_AMD_compressed_ATC_texture +#define GL_AMD_compressed_ATC_texture 1 +#endif + +/* AMD_performance_monitor */ +#ifndef GL_AMD_performance_monitor +#define GL_AMD_performance_monitor 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glGetPerfMonitorGroupsAMD (GLint *numGroups, GLsizei groupsSize, GLuint *groups); +GL_APICALL void GL_APIENTRY glGetPerfMonitorCountersAMD (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters); +GL_APICALL void GL_APIENTRY glGetPerfMonitorGroupStringAMD (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString); +GL_APICALL void GL_APIENTRY glGetPerfMonitorCounterStringAMD (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString); +GL_APICALL void GL_APIENTRY glGetPerfMonitorCounterInfoAMD (GLuint group, GLuint counter, GLenum pname, GLvoid *data); +GL_APICALL void GL_APIENTRY glGenPerfMonitorsAMD (GLsizei n, GLuint *monitors); +GL_APICALL void GL_APIENTRY glDeletePerfMonitorsAMD (GLsizei n, GLuint *monitors); +GL_APICALL void GL_APIENTRY glSelectPerfMonitorCountersAMD (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *countersList); +GL_APICALL void GL_APIENTRY glBeginPerfMonitorAMD (GLuint monitor); +GL_APICALL void GL_APIENTRY glEndPerfMonitorAMD (GLuint monitor); +GL_APICALL void GL_APIENTRY glGetPerfMonitorCounterDataAMD (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten); +#endif +typedef void (GL_APIENTRYP PFNGLGETPERFMONITORGROUPSAMDPROC) (GLint *numGroups, GLsizei groupsSize, GLuint *groups); +typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERSAMDPROC) (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters); +typedef void (GL_APIENTRYP PFNGLGETPERFMONITORGROUPSTRINGAMDPROC) (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString); +typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC) (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString); +typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERINFOAMDPROC) (GLuint group, GLuint counter, GLenum pname, GLvoid *data); +typedef void (GL_APIENTRYP PFNGLGENPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors); +typedef void (GL_APIENTRYP PFNGLDELETEPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors); +typedef void (GL_APIENTRYP PFNGLSELECTPERFMONITORCOUNTERSAMDPROC) (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *countersList); +typedef void (GL_APIENTRYP PFNGLBEGINPERFMONITORAMDPROC) (GLuint monitor); +typedef void (GL_APIENTRYP PFNGLENDPERFMONITORAMDPROC) (GLuint monitor); +typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERDATAAMDPROC) (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten); +#endif + +/* GL_AMD_program_binary_Z400 */ +#ifndef GL_AMD_program_binary_Z400 +#define GL_AMD_program_binary_Z400 1 +#endif + +/*------------------------------------------------------------------------* + * ANGLE extension functions + *------------------------------------------------------------------------*/ + +/* GL_ANGLE_framebuffer_blit */ +#ifndef GL_ANGLE_framebuffer_blit +#define GL_ANGLE_framebuffer_blit 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glBlitFramebufferANGLE (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); +#endif +typedef void (GL_APIENTRYP PFNGLBLITFRAMEBUFFERANGLEPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); +#endif + +/* GL_ANGLE_framebuffer_multisample */ +#ifndef GL_ANGLE_framebuffer_multisample +#define GL_ANGLE_framebuffer_multisample 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleANGLE (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); +#endif +typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEANGLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); +#endif + +#ifndef GL_ANGLE_instanced_arrays +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glDrawArraysInstancedANGLE (GLenum mode, GLint first, GLsizei count, GLsizei primcount); +GL_APICALL void GL_APIENTRY glDrawElementsInstancedANGLE (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount); +GL_APICALL void GL_APIENTRY glVertexAttribDivisorANGLE (GLuint index, GLuint divisor); +#endif +typedef void (GL_APIENTRYP PFLGLDRAWARRAYSINSTANCEDANGLEPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount); +typedef void (GL_APIENTRYP PFLGLDRAWELEMENTSINSTANCEDANGLEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount); +typedef void (GL_APIENTRYP PFLGLVERTEXATTRIBDIVISORANGLEPROC) (GLuint index, GLuint divisor); +#endif + +/* GL_ANGLE_pack_reverse_row_order */ +#ifndef GL_ANGLE_pack_reverse_row_order +#define GL_ANGLE_pack_reverse_row_order 1 +#endif + +/* GL_ANGLE_texture_compression_dxt3 */ +#ifndef GL_ANGLE_texture_compression_dxt3 +#define GL_ANGLE_texture_compression_dxt3 1 +#endif + +/* GL_ANGLE_texture_compression_dxt5 */ +#ifndef GL_ANGLE_texture_compression_dxt5 +#define GL_ANGLE_texture_compression_dxt5 1 +#endif + +/* GL_ANGLE_texture_usage */ +#ifndef GL_ANGLE_texture_usage +#define GL_ANGLE_texture_usage 1 +#endif + +#ifndef GL_ANGLE_translated_shader_source +#define GL_ANGLE_translated_shader_source 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glGetTranslatedShaderSourceANGLE (GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source); +#endif +typedef void (GL_APIENTRYP PFLGLGETTRANSLATEDSHADERSOURCEANGLEPROC) (GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source); +#endif + +/*------------------------------------------------------------------------* + * APPLE extension functions + *------------------------------------------------------------------------*/ + +/* GL_APPLE_copy_texture_levels */ +#ifndef GL_APPLE_copy_texture_levels +#define GL_APPLE_copy_texture_levels 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glCopyTextureLevelsAPPLE (GLuint destinationTexture, GLuint sourceTexture, GLint sourceBaseLevel, GLsizei sourceLevelCount); +#endif +typedef void (GL_APIENTRYP PFNGLCOPYTEXTURELEVELSAPPLEPROC) (GLuint destinationTexture, GLuint sourceTexture, GLint sourceBaseLevel, GLsizei sourceLevelCount); +#endif + +/* GL_APPLE_framebuffer_multisample */ +#ifndef GL_APPLE_framebuffer_multisample +#define GL_APPLE_framebuffer_multisample 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleAPPLE (GLenum, GLsizei, GLenum, GLsizei, GLsizei); +GL_APICALL void GL_APIENTRY glResolveMultisampleFramebufferAPPLE (void); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEAPPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); +typedef void (GL_APIENTRYP PFNGLRESOLVEMULTISAMPLEFRAMEBUFFERAPPLEPROC) (void); +#endif + +/* GL_APPLE_rgb_422 */ +#ifndef GL_APPLE_rgb_422 +#define GL_APPLE_rgb_422 1 +#endif + +/* GL_APPLE_sync */ +#ifndef GL_APPLE_sync +#define GL_APPLE_sync 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL GLsync GL_APIENTRY glFenceSyncAPPLE (GLenum condition, GLbitfield flags); +GL_APICALL GLboolean GL_APIENTRY glIsSyncAPPLE (GLsync sync); +GL_APICALL void GL_APIENTRY glDeleteSyncAPPLE (GLsync sync); +GL_APICALL GLenum GL_APIENTRY glClientWaitSyncAPPLE (GLsync sync, GLbitfield flags, GLuint64 timeout); +GL_APICALL void GL_APIENTRY glWaitSyncAPPLE (GLsync sync, GLbitfield flags, GLuint64 timeout); +GL_APICALL void GL_APIENTRY glGetInteger64vAPPLE (GLenum pname, GLint64 *params); +GL_APICALL void GL_APIENTRY glGetSyncivAPPLE (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); +#endif +typedef GLsync (GL_APIENTRYP PFNGLFENCESYNCAPPLEPROC) (GLenum condition, GLbitfield flags); +typedef GLboolean (GL_APIENTRYP PFNGLISSYNCAPPLEPROC) (GLsync sync); +typedef void (GL_APIENTRYP PFNGLDELETESYNCAPPLEPROC) (GLsync sync); +typedef GLenum (GL_APIENTRYP PFNGLCLIENTWAITSYNCAPPLEPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout); +typedef void (GL_APIENTRYP PFNGLWAITSYNCAPPLEPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout); +typedef void (GL_APIENTRYP PFNGLGETINTEGER64VAPPLEPROC) (GLenum pname, GLint64 *params); +typedef void (GL_APIENTRYP PFNGLGETSYNCIVAPPLEPROC) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); +#endif + +/* GL_APPLE_texture_format_BGRA8888 */ +#ifndef GL_APPLE_texture_format_BGRA8888 +#define GL_APPLE_texture_format_BGRA8888 1 +#endif + +/* GL_APPLE_texture_max_level */ +#ifndef GL_APPLE_texture_max_level +#define GL_APPLE_texture_max_level 1 +#endif + +/*------------------------------------------------------------------------* + * ARM extension functions + *------------------------------------------------------------------------*/ + +/* GL_ARM_mali_program_binary */ +#ifndef GL_ARM_mali_program_binary +#define GL_ARM_mali_program_binary 1 +#endif + +/* GL_ARM_mali_shader_binary */ +#ifndef GL_ARM_mali_shader_binary +#define GL_ARM_mali_shader_binary 1 +#endif + +/* GL_ARM_rgba8 */ +#ifndef GL_ARM_rgba8 +#define GL_ARM_rgba8 1 +#endif + +/*------------------------------------------------------------------------* + * EXT extension functions + *------------------------------------------------------------------------*/ + +/* GL_EXT_blend_minmax */ +#ifndef GL_EXT_blend_minmax +#define GL_EXT_blend_minmax 1 +#endif + +/* GL_EXT_color_buffer_half_float */ +#ifndef GL_EXT_color_buffer_half_float +#define GL_EXT_color_buffer_half_float 1 +#endif + +/* GL_EXT_debug_label */ +#ifndef GL_EXT_debug_label +#define GL_EXT_debug_label 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glLabelObjectEXT (GLenum type, GLuint object, GLsizei length, const GLchar *label); +GL_APICALL void GL_APIENTRY glGetObjectLabelEXT (GLenum type, GLuint object, GLsizei bufSize, GLsizei *length, GLchar *label); +#endif +typedef void (GL_APIENTRYP PFNGLLABELOBJECTEXTPROC) (GLenum type, GLuint object, GLsizei length, const GLchar *label); +typedef void (GL_APIENTRYP PFNGLGETOBJECTLABELEXTPROC) (GLenum type, GLuint object, GLsizei bufSize, GLsizei *length, GLchar *label); +#endif + +/* GL_EXT_debug_marker */ +#ifndef GL_EXT_debug_marker +#define GL_EXT_debug_marker 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glInsertEventMarkerEXT (GLsizei length, const GLchar *marker); +GL_APICALL void GL_APIENTRY glPushGroupMarkerEXT (GLsizei length, const GLchar *marker); +GL_APICALL void GL_APIENTRY glPopGroupMarkerEXT (void); +#endif +typedef void (GL_APIENTRYP PFNGLINSERTEVENTMARKEREXTPROC) (GLsizei length, const GLchar *marker); +typedef void (GL_APIENTRYP PFNGLPUSHGROUPMARKEREXTPROC) (GLsizei length, const GLchar *marker); +typedef void (GL_APIENTRYP PFNGLPOPGROUPMARKEREXTPROC) (void); +#endif + +/* GL_EXT_discard_framebuffer */ +#ifndef GL_EXT_discard_framebuffer +#define GL_EXT_discard_framebuffer 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glDiscardFramebufferEXT (GLenum target, GLsizei numAttachments, const GLenum *attachments); +#endif +typedef void (GL_APIENTRYP PFNGLDISCARDFRAMEBUFFEREXTPROC) (GLenum target, GLsizei numAttachments, const GLenum *attachments); +#endif + +/* GL_EXT_map_buffer_range */ +#ifndef GL_EXT_map_buffer_range +#define GL_EXT_map_buffer_range 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void* GL_APIENTRY glMapBufferRangeEXT (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); +GL_APICALL void GL_APIENTRY glFlushMappedBufferRangeEXT (GLenum target, GLintptr offset, GLsizeiptr length); +#endif +typedef void* (GL_APIENTRYP PFNGLMAPBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); +typedef void (GL_APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length); +#endif + +/* GL_EXT_multisampled_render_to_texture */ +#ifndef GL_EXT_multisampled_render_to_texture +#define GL_EXT_multisampled_render_to_texture 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleEXT (GLenum, GLsizei, GLenum, GLsizei, GLsizei); +GL_APICALL void GL_APIENTRY glFramebufferTexture2DMultisampleEXT (GLenum, GLenum, GLenum, GLuint, GLint, GLsizei); +#endif +typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); +typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples); +#endif + +/* GL_EXT_multiview_draw_buffers */ +#ifndef GL_EXT_multiview_draw_buffers +#define GL_EXT_multiview_draw_buffers 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glReadBufferIndexedEXT (GLenum src, GLint index); +GL_APICALL void GL_APIENTRY glDrawBuffersIndexedEXT (GLint n, const GLenum *location, const GLint *indices); +GL_APICALL void GL_APIENTRY glGetIntegeri_vEXT (GLenum target, GLuint index, GLint *data); +#endif +typedef void (GL_APIENTRYP PFNGLREADBUFFERINDEXEDEXTPROC) (GLenum src, GLint index); +typedef void (GL_APIENTRYP PFNGLDRAWBUFFERSINDEXEDEXTPROC) (GLint n, const GLenum *location, const GLint *indices); +typedef void (GL_APIENTRYP PFNGLGETINTEGERI_VEXTPROC) (GLenum target, GLuint index, GLint *data); +#endif + +#ifndef GL_EXT_multi_draw_arrays +#define GL_EXT_multi_draw_arrays 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glMultiDrawArraysEXT (GLenum, GLint *, GLsizei *, GLsizei); +GL_APICALL void GL_APIENTRY glMultiDrawElementsEXT (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (GL_APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount); +typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount); +#endif + +/* GL_EXT_occlusion_query_boolean */ +#ifndef GL_EXT_occlusion_query_boolean +#define GL_EXT_occlusion_query_boolean 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glGenQueriesEXT (GLsizei n, GLuint *ids); +GL_APICALL void GL_APIENTRY glDeleteQueriesEXT (GLsizei n, const GLuint *ids); +GL_APICALL GLboolean GL_APIENTRY glIsQueryEXT (GLuint id); +GL_APICALL void GL_APIENTRY glBeginQueryEXT (GLenum target, GLuint id); +GL_APICALL void GL_APIENTRY glEndQueryEXT (GLenum target); +GL_APICALL void GL_APIENTRY glGetQueryivEXT (GLenum target, GLenum pname, GLint *params); +GL_APICALL void GL_APIENTRY glGetQueryObjectuivEXT (GLuint id, GLenum pname, GLuint *params); +#endif +typedef void (GL_APIENTRYP PFNGLGENQUERIESEXTPROC) (GLsizei n, GLuint *ids); +typedef void (GL_APIENTRYP PFNGLDELETEQUERIESEXTPROC) (GLsizei n, const GLuint *ids); +typedef GLboolean (GL_APIENTRYP PFNGLISQUERYEXTPROC) (GLuint id); +typedef void (GL_APIENTRYP PFNGLBEGINQUERYEXTPROC) (GLenum target, GLuint id); +typedef void (GL_APIENTRYP PFNGLENDQUERYEXTPROC) (GLenum target); +typedef void (GL_APIENTRYP PFNGLGETQUERYIVEXTPROC) (GLenum target, GLenum pname, GLint *params); +typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTUIVEXTPROC) (GLuint id, GLenum pname, GLuint *params); +#endif + +/* GL_EXT_read_format_bgra */ +#ifndef GL_EXT_read_format_bgra +#define GL_EXT_read_format_bgra 1 +#endif + +/* GL_EXT_robustness */ +#ifndef GL_EXT_robustness +#define GL_EXT_robustness 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL GLenum GL_APIENTRY glGetGraphicsResetStatusEXT (void); +GL_APICALL void GL_APIENTRY glReadnPixelsEXT (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data); +GL_APICALL void GL_APIENTRY glGetnUniformfvEXT (GLuint program, GLint location, GLsizei bufSize, float *params); +GL_APICALL void GL_APIENTRY glGetnUniformivEXT (GLuint program, GLint location, GLsizei bufSize, GLint *params); +#endif +typedef GLenum (GL_APIENTRYP PFNGLGETGRAPHICSRESETSTATUSEXTPROC) (void); +typedef void (GL_APIENTRYP PFNGLREADNPIXELSEXTPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data); +typedef void (GL_APIENTRYP PFNGLGETNUNIFORMFVEXTPROC) (GLuint program, GLint location, GLsizei bufSize, float *params); +typedef void (GL_APIENTRYP PFNGLGETNUNIFORMIVEXTPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params); +#endif + +/* GL_EXT_separate_shader_objects */ +#ifndef GL_EXT_separate_shader_objects +#define GL_EXT_separate_shader_objects 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glUseProgramStagesEXT (GLuint pipeline, GLbitfield stages, GLuint program); +GL_APICALL void GL_APIENTRY glActiveShaderProgramEXT (GLuint pipeline, GLuint program); +GL_APICALL GLuint GL_APIENTRY glCreateShaderProgramvEXT (GLenum type, GLsizei count, const GLchar **strings); +GL_APICALL void GL_APIENTRY glBindProgramPipelineEXT (GLuint pipeline); +GL_APICALL void GL_APIENTRY glDeleteProgramPipelinesEXT (GLsizei n, const GLuint *pipelines); +GL_APICALL void GL_APIENTRY glGenProgramPipelinesEXT (GLsizei n, GLuint *pipelines); +GL_APICALL GLboolean GL_APIENTRY glIsProgramPipelineEXT (GLuint pipeline); +GL_APICALL void GL_APIENTRY glProgramParameteriEXT (GLuint program, GLenum pname, GLint value); +GL_APICALL void GL_APIENTRY glGetProgramPipelineivEXT (GLuint pipeline, GLenum pname, GLint *params); +GL_APICALL void GL_APIENTRY glProgramUniform1iEXT (GLuint program, GLint location, GLint x); +GL_APICALL void GL_APIENTRY glProgramUniform2iEXT (GLuint program, GLint location, GLint x, GLint y); +GL_APICALL void GL_APIENTRY glProgramUniform3iEXT (GLuint program, GLint location, GLint x, GLint y, GLint z); +GL_APICALL void GL_APIENTRY glProgramUniform4iEXT (GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w); +GL_APICALL void GL_APIENTRY glProgramUniform1fEXT (GLuint program, GLint location, GLfloat x); +GL_APICALL void GL_APIENTRY glProgramUniform2fEXT (GLuint program, GLint location, GLfloat x, GLfloat y); +GL_APICALL void GL_APIENTRY glProgramUniform3fEXT (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z); +GL_APICALL void GL_APIENTRY glProgramUniform4fEXT (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w); +GL_APICALL void GL_APIENTRY glProgramUniform1ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); +GL_APICALL void GL_APIENTRY glProgramUniform2ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); +GL_APICALL void GL_APIENTRY glProgramUniform3ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); +GL_APICALL void GL_APIENTRY glProgramUniform4ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); +GL_APICALL void GL_APIENTRY glProgramUniform1fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); +GL_APICALL void GL_APIENTRY glProgramUniform2fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); +GL_APICALL void GL_APIENTRY glProgramUniform3fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); +GL_APICALL void GL_APIENTRY glProgramUniform4fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); +GL_APICALL void GL_APIENTRY glProgramUniformMatrix2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +GL_APICALL void GL_APIENTRY glProgramUniformMatrix3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +GL_APICALL void GL_APIENTRY glProgramUniformMatrix4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +GL_APICALL void GL_APIENTRY glValidateProgramPipelineEXT (GLuint pipeline); +GL_APICALL void GL_APIENTRY glGetProgramPipelineInfoLogEXT (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog); +#endif +typedef void (GL_APIENTRYP PFNGLUSEPROGRAMSTAGESEXTPROC) (GLuint pipeline, GLbitfield stages, GLuint program); +typedef void (GL_APIENTRYP PFNGLACTIVESHADERPROGRAMEXTPROC) (GLuint pipeline, GLuint program); +typedef GLuint (GL_APIENTRYP PFNGLCREATESHADERPROGRAMVEXTPROC) (GLenum type, GLsizei count, const GLchar **strings); +typedef void (GL_APIENTRYP PFNGLBINDPROGRAMPIPELINEEXTPROC) (GLuint pipeline); +typedef void (GL_APIENTRYP PFNGLDELETEPROGRAMPIPELINESEXTPROC) (GLsizei n, const GLuint *pipelines); +typedef void (GL_APIENTRYP PFNGLGENPROGRAMPIPELINESEXTPROC) (GLsizei n, GLuint *pipelines); +typedef GLboolean (GL_APIENTRYP PFNGLISPROGRAMPIPELINEEXTPROC) (GLuint pipeline); +typedef void (GL_APIENTRYP PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value); +typedef void (GL_APIENTRYP PFNGLGETPROGRAMPIPELINEIVEXTPROC) (GLuint pipeline, GLenum pname, GLint *params); +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1IEXTPROC) (GLuint program, GLint location, GLint x); +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2IEXTPROC) (GLuint program, GLint location, GLint x, GLint y); +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3IEXTPROC) (GLuint program, GLint location, GLint x, GLint y, GLint z); +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4IEXTPROC) (GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w); +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1FEXTPROC) (GLuint program, GLint location, GLfloat x); +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2FEXTPROC) (GLuint program, GLint location, GLfloat x, GLfloat y); +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3FEXTPROC) (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z); +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4FEXTPROC) (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w); +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +typedef void (GL_APIENTRYP PFNGLVALIDATEPROGRAMPIPELINEEXTPROC) (GLuint pipeline); +typedef void (GL_APIENTRYP PFNGLGETPROGRAMPIPELINEINFOLOGEXTPROC) (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog); +#endif + +/* GL_EXT_shader_framebuffer_fetch */ +#ifndef GL_EXT_shader_framebuffer_fetch +#define GL_EXT_shader_framebuffer_fetch 1 +#endif + +/* GL_EXT_shader_texture_lod */ +#ifndef GL_EXT_shader_texture_lod +#define GL_EXT_shader_texture_lod 1 +#endif + +/* GL_EXT_shadow_samplers */ +#ifndef GL_EXT_shadow_samplers +#define GL_EXT_shadow_samplers 1 +#endif + +/* GL_EXT_sRGB */ +#ifndef GL_EXT_sRGB +#define GL_EXT_sRGB 1 +#endif + +/* GL_EXT_texture_compression_dxt1 */ +#ifndef GL_EXT_texture_compression_dxt1 +#define GL_EXT_texture_compression_dxt1 1 +#endif + +/* GL_EXT_texture_filter_anisotropic */ +#ifndef GL_EXT_texture_filter_anisotropic +#define GL_EXT_texture_filter_anisotropic 1 +#endif + +/* GL_EXT_texture_format_BGRA8888 */ +#ifndef GL_EXT_texture_format_BGRA8888 +#define GL_EXT_texture_format_BGRA8888 1 +#endif + +/* GL_EXT_texture_rg */ +#ifndef GL_EXT_texture_rg +#define GL_EXT_texture_rg 1 +#endif + +/* GL_EXT_texture_storage */ +#ifndef GL_EXT_texture_storage +#define GL_EXT_texture_storage 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glTexStorage1DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); +GL_APICALL void GL_APIENTRY glTexStorage2DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); +GL_APICALL void GL_APIENTRY glTexStorage3DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); +GL_APICALL void GL_APIENTRY glTextureStorage1DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); +GL_APICALL void GL_APIENTRY glTextureStorage2DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); +GL_APICALL void GL_APIENTRY glTextureStorage3DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); +#endif +typedef void (GL_APIENTRYP PFNGLTEXSTORAGE1DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); +typedef void (GL_APIENTRYP PFNGLTEXSTORAGE2DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); +typedef void (GL_APIENTRYP PFNGLTEXSTORAGE3DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); +typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE1DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); +typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE2DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); +typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE3DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); +#endif + +/* GL_EXT_texture_type_2_10_10_10_REV */ +#ifndef GL_EXT_texture_type_2_10_10_10_REV +#define GL_EXT_texture_type_2_10_10_10_REV 1 +#endif + +/* GL_EXT_unpack_subimage */ +#ifndef GL_EXT_unpack_subimage +#define GL_EXT_unpack_subimage 1 +#endif + +/*------------------------------------------------------------------------* + * DMP extension functions + *------------------------------------------------------------------------*/ + +/* GL_DMP_shader_binary */ +#ifndef GL_DMP_shader_binary +#define GL_DMP_shader_binary 1 +#endif + +/*------------------------------------------------------------------------* + * FJ extension functions + *------------------------------------------------------------------------*/ + +/* GL_FJ_shader_binary_GCCSO */ +#ifndef GL_FJ_shader_binary_GCCSO +#define GL_FJ_shader_binary_GCCSO 1 +#endif + +/*------------------------------------------------------------------------* + * IMG extension functions + *------------------------------------------------------------------------*/ + +/* GL_IMG_program_binary */ +#ifndef GL_IMG_program_binary +#define GL_IMG_program_binary 1 +#endif + +/* GL_IMG_read_format */ +#ifndef GL_IMG_read_format +#define GL_IMG_read_format 1 +#endif + +/* GL_IMG_shader_binary */ +#ifndef GL_IMG_shader_binary +#define GL_IMG_shader_binary 1 +#endif + +/* GL_IMG_texture_compression_pvrtc */ +#ifndef GL_IMG_texture_compression_pvrtc +#define GL_IMG_texture_compression_pvrtc 1 +#endif + +/* GL_IMG_multisampled_render_to_texture */ +#ifndef GL_IMG_multisampled_render_to_texture +#define GL_IMG_multisampled_render_to_texture 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleIMG (GLenum, GLsizei, GLenum, GLsizei, GLsizei); +GL_APICALL void GL_APIENTRY glFramebufferTexture2DMultisampleIMG (GLenum, GLenum, GLenum, GLuint, GLint, GLsizei); +#endif +typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEIMGPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); +typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMGPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples); +#endif + +/*------------------------------------------------------------------------* + * NV extension functions + *------------------------------------------------------------------------*/ + +/* GL_NV_coverage_sample */ +#ifndef GL_NV_coverage_sample +#define GL_NV_coverage_sample 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glCoverageMaskNV (GLboolean mask); +GL_APICALL void GL_APIENTRY glCoverageOperationNV (GLenum operation); +#endif +typedef void (GL_APIENTRYP PFNGLCOVERAGEMASKNVPROC) (GLboolean mask); +typedef void (GL_APIENTRYP PFNGLCOVERAGEOPERATIONNVPROC) (GLenum operation); +#endif + +/* GL_NV_depth_nonlinear */ +#ifndef GL_NV_depth_nonlinear +#define GL_NV_depth_nonlinear 1 +#endif + +/* GL_NV_draw_buffers */ +#ifndef GL_NV_draw_buffers +#define GL_NV_draw_buffers 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glDrawBuffersNV (GLsizei n, const GLenum *bufs); +#endif +typedef void (GL_APIENTRYP PFNGLDRAWBUFFERSNVPROC) (GLsizei n, const GLenum *bufs); +#endif + +/* GL_NV_fbo_color_attachments */ +#ifndef GL_NV_fbo_color_attachments +#define GL_NV_fbo_color_attachments 1 +#endif + +/* GL_NV_fence */ +#ifndef GL_NV_fence +#define GL_NV_fence 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glDeleteFencesNV (GLsizei, const GLuint *); +GL_APICALL void GL_APIENTRY glGenFencesNV (GLsizei, GLuint *); +GL_APICALL GLboolean GL_APIENTRY glIsFenceNV (GLuint); +GL_APICALL GLboolean GL_APIENTRY glTestFenceNV (GLuint); +GL_APICALL void GL_APIENTRY glGetFenceivNV (GLuint, GLenum, GLint *); +GL_APICALL void GL_APIENTRY glFinishFenceNV (GLuint); +GL_APICALL void GL_APIENTRY glSetFenceNV (GLuint, GLenum); +#endif +typedef void (GL_APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences); +typedef void (GL_APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences); +typedef GLboolean (GL_APIENTRYP PFNGLISFENCENVPROC) (GLuint fence); +typedef GLboolean (GL_APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence); +typedef void (GL_APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params); +typedef void (GL_APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence); +typedef void (GL_APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition); +#endif + +/* GL_NV_read_buffer */ +#ifndef GL_NV_read_buffer +#define GL_NV_read_buffer 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glReadBufferNV (GLenum mode); +#endif +typedef void (GL_APIENTRYP PFNGLREADBUFFERNVPROC) (GLenum mode); +#endif + +/* GL_NV_read_buffer_front */ +#ifndef GL_NV_read_buffer_front +#define GL_NV_read_buffer_front 1 +#endif + +/* GL_NV_read_depth */ +#ifndef GL_NV_read_depth +#define GL_NV_read_depth 1 +#endif + +/* GL_NV_read_depth_stencil */ +#ifndef GL_NV_read_depth_stencil +#define GL_NV_read_depth_stencil 1 +#endif + +/* GL_NV_read_stencil */ +#ifndef GL_NV_read_stencil +#define GL_NV_read_stencil 1 +#endif + +/* GL_NV_texture_compression_s3tc_update */ +#ifndef GL_NV_texture_compression_s3tc_update +#define GL_NV_texture_compression_s3tc_update 1 +#endif + +/* GL_NV_texture_npot_2D_mipmap */ +#ifndef GL_NV_texture_npot_2D_mipmap +#define GL_NV_texture_npot_2D_mipmap 1 +#endif + +/*------------------------------------------------------------------------* + * QCOM extension functions + *------------------------------------------------------------------------*/ + +/* GL_QCOM_alpha_test */ +#ifndef GL_QCOM_alpha_test +#define GL_QCOM_alpha_test 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glAlphaFuncQCOM (GLenum func, GLclampf ref); +#endif +typedef void (GL_APIENTRYP PFNGLALPHAFUNCQCOMPROC) (GLenum func, GLclampf ref); +#endif + +/* GL_QCOM_binning_control */ +#ifndef GL_QCOM_binning_control +#define GL_QCOM_binning_control 1 +#endif + +/* GL_QCOM_driver_control */ +#ifndef GL_QCOM_driver_control +#define GL_QCOM_driver_control 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glGetDriverControlsQCOM (GLint *num, GLsizei size, GLuint *driverControls); +GL_APICALL void GL_APIENTRY glGetDriverControlStringQCOM (GLuint driverControl, GLsizei bufSize, GLsizei *length, GLchar *driverControlString); +GL_APICALL void GL_APIENTRY glEnableDriverControlQCOM (GLuint driverControl); +GL_APICALL void GL_APIENTRY glDisableDriverControlQCOM (GLuint driverControl); +#endif +typedef void (GL_APIENTRYP PFNGLGETDRIVERCONTROLSQCOMPROC) (GLint *num, GLsizei size, GLuint *driverControls); +typedef void (GL_APIENTRYP PFNGLGETDRIVERCONTROLSTRINGQCOMPROC) (GLuint driverControl, GLsizei bufSize, GLsizei *length, GLchar *driverControlString); +typedef void (GL_APIENTRYP PFNGLENABLEDRIVERCONTROLQCOMPROC) (GLuint driverControl); +typedef void (GL_APIENTRYP PFNGLDISABLEDRIVERCONTROLQCOMPROC) (GLuint driverControl); +#endif + +/* GL_QCOM_extended_get */ +#ifndef GL_QCOM_extended_get +#define GL_QCOM_extended_get 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glExtGetTexturesQCOM (GLuint *textures, GLint maxTextures, GLint *numTextures); +GL_APICALL void GL_APIENTRY glExtGetBuffersQCOM (GLuint *buffers, GLint maxBuffers, GLint *numBuffers); +GL_APICALL void GL_APIENTRY glExtGetRenderbuffersQCOM (GLuint *renderbuffers, GLint maxRenderbuffers, GLint *numRenderbuffers); +GL_APICALL void GL_APIENTRY glExtGetFramebuffersQCOM (GLuint *framebuffers, GLint maxFramebuffers, GLint *numFramebuffers); +GL_APICALL void GL_APIENTRY glExtGetTexLevelParameterivQCOM (GLuint texture, GLenum face, GLint level, GLenum pname, GLint *params); +GL_APICALL void GL_APIENTRY glExtTexObjectStateOverrideiQCOM (GLenum target, GLenum pname, GLint param); +GL_APICALL void GL_APIENTRY glExtGetTexSubImageQCOM (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLvoid *texels); +GL_APICALL void GL_APIENTRY glExtGetBufferPointervQCOM (GLenum target, GLvoid **params); +#endif +typedef void (GL_APIENTRYP PFNGLEXTGETTEXTURESQCOMPROC) (GLuint *textures, GLint maxTextures, GLint *numTextures); +typedef void (GL_APIENTRYP PFNGLEXTGETBUFFERSQCOMPROC) (GLuint *buffers, GLint maxBuffers, GLint *numBuffers); +typedef void (GL_APIENTRYP PFNGLEXTGETRENDERBUFFERSQCOMPROC) (GLuint *renderbuffers, GLint maxRenderbuffers, GLint *numRenderbuffers); +typedef void (GL_APIENTRYP PFNGLEXTGETFRAMEBUFFERSQCOMPROC) (GLuint *framebuffers, GLint maxFramebuffers, GLint *numFramebuffers); +typedef void (GL_APIENTRYP PFNGLEXTGETTEXLEVELPARAMETERIVQCOMPROC) (GLuint texture, GLenum face, GLint level, GLenum pname, GLint *params); +typedef void (GL_APIENTRYP PFNGLEXTTEXOBJECTSTATEOVERRIDEIQCOMPROC) (GLenum target, GLenum pname, GLint param); +typedef void (GL_APIENTRYP PFNGLEXTGETTEXSUBIMAGEQCOMPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLvoid *texels); +typedef void (GL_APIENTRYP PFNGLEXTGETBUFFERPOINTERVQCOMPROC) (GLenum target, GLvoid **params); +#endif + +/* GL_QCOM_extended_get2 */ +#ifndef GL_QCOM_extended_get2 +#define GL_QCOM_extended_get2 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glExtGetShadersQCOM (GLuint *shaders, GLint maxShaders, GLint *numShaders); +GL_APICALL void GL_APIENTRY glExtGetProgramsQCOM (GLuint *programs, GLint maxPrograms, GLint *numPrograms); +GL_APICALL GLboolean GL_APIENTRY glExtIsProgramBinaryQCOM (GLuint program); +GL_APICALL void GL_APIENTRY glExtGetProgramBinarySourceQCOM (GLuint program, GLenum shadertype, GLchar *source, GLint *length); +#endif +typedef void (GL_APIENTRYP PFNGLEXTGETSHADERSQCOMPROC) (GLuint *shaders, GLint maxShaders, GLint *numShaders); +typedef void (GL_APIENTRYP PFNGLEXTGETPROGRAMSQCOMPROC) (GLuint *programs, GLint maxPrograms, GLint *numPrograms); +typedef GLboolean (GL_APIENTRYP PFNGLEXTISPROGRAMBINARYQCOMPROC) (GLuint program); +typedef void (GL_APIENTRYP PFNGLEXTGETPROGRAMBINARYSOURCEQCOMPROC) (GLuint program, GLenum shadertype, GLchar *source, GLint *length); +#endif + +/* GL_QCOM_perfmon_global_mode */ +#ifndef GL_QCOM_perfmon_global_mode +#define GL_QCOM_perfmon_global_mode 1 +#endif + +/* GL_QCOM_writeonly_rendering */ +#ifndef GL_QCOM_writeonly_rendering +#define GL_QCOM_writeonly_rendering 1 +#endif + +/* GL_QCOM_tiled_rendering */ +#ifndef GL_QCOM_tiled_rendering +#define GL_QCOM_tiled_rendering 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glStartTilingQCOM (GLuint x, GLuint y, GLuint width, GLuint height, GLbitfield preserveMask); +GL_APICALL void GL_APIENTRY glEndTilingQCOM (GLbitfield preserveMask); +#endif +typedef void (GL_APIENTRYP PFNGLSTARTTILINGQCOMPROC) (GLuint x, GLuint y, GLuint width, GLuint height, GLbitfield preserveMask); +typedef void (GL_APIENTRYP PFNGLENDTILINGQCOMPROC) (GLbitfield preserveMask); +#endif + +/*------------------------------------------------------------------------* + * VIV extension tokens + *------------------------------------------------------------------------*/ + +/* GL_VIV_shader_binary */ +#ifndef GL_VIV_shader_binary +#define GL_VIV_shader_binary 1 +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* __gl2ext_h_ */ From 93a5e7230fec586b86fd7edc7c7628add4a52164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 10 Nov 2012 20:44:14 +0100 Subject: [PATCH 06/18] Use OpenGL ES 2.0 specific definitions for extension-only functionality. If targetting explicitly OpenGL ES 2.0, only gl2.h is included (not gl3.h). --- src/AbstractShaderProgram.h | 10 +++++++++- src/AbstractTexture.h | 4 ++++ src/Framebuffer.h | 8 ++++++++ src/Magnum.h | 5 +++++ src/Query.h | 8 ++++++++ 5 files changed, 34 insertions(+), 1 deletion(-) diff --git a/src/AbstractShaderProgram.h b/src/AbstractShaderProgram.h index 504ef9d06..b768ea334 100644 --- a/src/AbstractShaderProgram.h +++ b/src/AbstractShaderProgram.h @@ -1058,7 +1058,11 @@ template<> struct Attribute { Short = GL_SHORT, UnsignedInt = GL_UNSIGNED_INT, Int = GL_INT, + #ifndef MAGNUM_TARGET_GLES2 HalfFloat = GL_HALF_FLOAT, + #else + HalfFloat = GL_HALF_FLOAT_OES, + #endif Float = GL_FLOAT #ifndef MAGNUM_TARGET_GLES @@ -1104,7 +1108,11 @@ template<> struct Attribute> { Short = GL_SHORT, UnsignedInt = GL_UNSIGNED_INT, Int = GL_INT, - Half = GL_HALF_FLOAT, + #ifndef MAGNUM_TARGET_GLES2 + HalfFloat = GL_HALF_FLOAT, + #else + HalfFloat = GL_HALF_FLOAT_OES, + #endif Float = GL_FLOAT #ifndef MAGNUM_TARGET_GLES , diff --git a/src/AbstractTexture.h b/src/AbstractTexture.h index f9581dd02..bcfe10cf5 100644 --- a/src/AbstractTexture.h +++ b/src/AbstractTexture.h @@ -874,8 +874,12 @@ template<> struct MAGNUM_EXPORT AbstractTexture::DataHelper<2> { }; template<> struct MAGNUM_EXPORT AbstractTexture::DataHelper<3> { enum class Target: GLenum { + #ifndef MAGNUM_TARGET_GLES2 Texture3D = GL_TEXTURE_3D, Texture2DArray = GL_TEXTURE_2D_ARRAY + #else + Texture3D = GL_TEXTURE_3D_OES + #endif }; inline constexpr static Target target() { return Target::Texture3D; } diff --git a/src/Framebuffer.h b/src/Framebuffer.h index 77b1a1746..e18fe083d 100644 --- a/src/Framebuffer.h +++ b/src/Framebuffer.h @@ -710,7 +710,11 @@ class MAGNUM_EXPORT Framebuffer { * @requires_gles30 %Extension @es_extension{APPLE,framebuffer_multisample} * or @es_extension{ANGLE,framebuffer_blit} */ + #ifndef MAGNUM_TARGET_GLES2 Read = GL_READ_FRAMEBUFFER, + #else + Read = GL_READ_FRAMEBUFFER_APPLE, + #endif /** * For drawing only. @@ -718,7 +722,11 @@ class MAGNUM_EXPORT Framebuffer { * @requires_gles30 %Extension @es_extension{APPLE,framebuffer_multisample} * or @es_extension{ANGLE,framebuffer_blit} */ + #ifndef MAGNUM_TARGET_GLES2 Draw = GL_DRAW_FRAMEBUFFER, + #else + Draw = GL_DRAW_FRAMEBUFFER_APPLE, + #endif ReadDraw = GL_FRAMEBUFFER /**< For both reading and drawing. */ }; diff --git a/src/Magnum.h b/src/Magnum.h index 9300082ee..4a442f629 100644 --- a/src/Magnum.h +++ b/src/Magnum.h @@ -25,7 +25,12 @@ #include #include #else +#ifndef MAGNUM_TARGET_GLES2 #include +#else +#include +#include +#endif #endif /** diff --git a/src/Query.h b/src/Query.h index 4816ba2a7..934f92e8d 100644 --- a/src/Query.h +++ b/src/Query.h @@ -229,7 +229,11 @@ class MAGNUM_EXPORT SampleQuery: public AbstractQuery { * Whether any samples passed from fragment shader * @requires_gl33 Extension @extension{ARB,occlusion_query2} */ + #ifndef MAGNUM_TARGET_GLES2 AnySamplesPassed = GL_ANY_SAMPLES_PASSED, + #else + AnySamplesPassed = GL_ANY_SAMPLES_PASSED_EXT, + #endif /** * Whether any samples passed from fragment shader (conservative) @@ -238,7 +242,11 @@ class MAGNUM_EXPORT SampleQuery: public AbstractQuery { * test at the expense of some false positives. * @requires_gl43 Extension @extension{ARB,ES3_compatibility} */ + #ifndef MAGNUM_TARGET_GLES2 AnySamplesPassedConservative = GL_ANY_SAMPLES_PASSED_CONSERVATIVE + #else + AnySamplesPassedConservative = GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT + #endif }; #ifndef MAGNUM_TARGET_GLES From 2779455c5f4897e2d88401f69ce1b079ba064da9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 10 Nov 2012 20:47:25 +0100 Subject: [PATCH 07/18] Moved configuration to root CMakeLists so it is near to option() calls. --- CMakeLists.txt | 11 +++++++++++ src/CMakeLists.txt | 12 ------------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f307a54d6..5713f9a8c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,6 +39,17 @@ else() find_package(OpenGLES2 REQUIRED) endif() +# Configuration variables (saved later to corradeConfigure.h) +if(TARGET_GLES) + set(MAGNUM_TARGET_GLES 1) +endif() +if(TARGET_GLES2) + set(MAGNUM_TARGET_GLES2 1) +endif() +if(GCC46_COMPATIBILITY) + set(MAGNUM_GCC46_COMPATIBILITY 1) +endif() + # Installation paths set(MAGNUM_LIBRARY_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) set(MAGNUM_CMAKE_MODULE_INSTALL_DIR ${CMAKE_ROOT}/Modules) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 19b3dea06..ac2aac236 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,18 +4,6 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wdouble-promotion") endif() -# If targeting GLES, save it into configuration header -if(TARGET_GLES) - set(MAGNUM_TARGET_GLES 1) -endif() -if(TARGET_GLES2) - set(MAGNUM_TARGET_GLES2 1) -endif() - -if(GCC46_COMPATIBILITY) - set(MAGNUM_GCC46_COMPATIBILITY 1) -endif() - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/magnumConfigure.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/magnumConfigure.h) From a4d5d3682bb066b70c2101f96d9c5b268301a154 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 10 Nov 2012 21:14:59 +0100 Subject: [PATCH 08/18] Doc: added page with links to valuable "best practices" information. --- doc/best-practices.dox | 15 +++++++++++++++ doc/features.dox | 1 - doc/tips.dox | 8 ++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 doc/best-practices.dox create mode 100644 doc/tips.dox diff --git a/doc/best-practices.dox b/doc/best-practices.dox new file mode 100644 index 000000000..c3f500338 --- /dev/null +++ b/doc/best-practices.dox @@ -0,0 +1,15 @@ +/** @page best-practices Best practices in OpenGL + +@brief Platform-specific and general performance advices + +Here is collection of carefully selected links to official guidelines and +other articles with valuable information to help developers create better +applications. Feel free to add one, if it contains new unique information. + +@section best-practices-platform Platform-specific + +- Mac OS - [Best Practices for Working with Vertex Data](https://developer.apple.com/library/mac/#documentation/graphicsimaging/Conceptual/OpenGL-MacProgGuide/opengl_vertexdata/opengl_vertexdata.html), [Best Practices for Working with Texture Data](https://developer.apple.com/library/mac/#documentation/graphicsimaging/Conceptual/OpenGL-MacProgGuide/opengl_texturedata/opengl_texturedata.html) +- iOS - [Best Practices for Working with Vertex Data](http://developer.apple.com/library/ios/#documentation/3DDrawing/Conceptual/OpenGLES_ProgrammingGuide/TechniquesforWorkingwithVertexData/TechniquesforWorkingwithVertexData.html), [Best Practices for Working with Texture Data](http://developer.apple.com/library/ios/#documentation/3DDrawing/Conceptual/OpenGLES_ProgrammingGuide/TechniquesForWorkingWithTextureData/TechniquesForWorkingWithTextureData.html), [Best Practices for Shaders](http://developer.apple.com/library/ios/#documentation/3DDrawing/Conceptual/OpenGLES_ProgrammingGuide/BestPracticesforShaders/BestPracticesforShaders.html#//apple_ref/doc/uid/TP40008793-CH7-SW3) +- Google Chrome Native Client - [Best practices for 3D graphics](https://developers.google.com/native-client/beta/devguide/coding/3D-graphics#best-practices) + +*/ diff --git a/doc/features.dox b/doc/features.dox index d033816fe..339e66824 100644 --- a/doc/features.dox +++ b/doc/features.dox @@ -5,6 +5,5 @@ namespace Magnum { - @subpage matrix-vector - @copybrief matrix-vector - @subpage scenegraph - @copybrief scenegraph - @subpage collision-detection - @copybrief collision-detection -- @subpage compilation-speedup - @copybrief compilation-speedup */ } diff --git a/doc/tips.dox b/doc/tips.dox new file mode 100644 index 000000000..dfaea8909 --- /dev/null +++ b/doc/tips.dox @@ -0,0 +1,8 @@ +namespace Magnum { +/** @page tips Tips and tricks +@brief Hints for better productivity and performance + +- @subpage compilation-speedup - @copybrief compilation-speedup +- @subpage best-practices - @copybrief best-practices +*/ +} From 81b69f17e1c3299aae9e762bd8dfc808449ba78d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 10 Nov 2012 21:26:00 +0100 Subject: [PATCH 09/18] Shaders: another iteration in porting of Phong and Flat shaders to GLES. Hope the reduced precision won't hurt. --- src/Shaders/FlatShader2D.frag | 4 ++-- src/Shaders/FlatShader2D.vert | 6 +++--- src/Shaders/PhongShader.frag | 28 ++++++++++++++-------------- src/Shaders/PhongShader.vert | 24 ++++++++++++------------ src/Shaders/compatibility.glsl | 7 +++++++ 5 files changed, 38 insertions(+), 31 deletions(-) diff --git a/src/Shaders/FlatShader2D.frag b/src/Shaders/FlatShader2D.frag index bdc52dd38..44051058d 100644 --- a/src/Shaders/FlatShader2D.frag +++ b/src/Shaders/FlatShader2D.frag @@ -2,10 +2,10 @@ #define fragmentColor gl_FragColor #endif -uniform vec3 color; +uniform lowp vec3 color; #ifndef NEW_GLSL -out vec4 fragmentColor; +out lowp vec4 fragmentColor; #endif void main() { diff --git a/src/Shaders/FlatShader2D.vert b/src/Shaders/FlatShader2D.vert index 60355d131..dc702bf98 100644 --- a/src/Shaders/FlatShader2D.vert +++ b/src/Shaders/FlatShader2D.vert @@ -2,12 +2,12 @@ #define in attribute #endif -uniform mat3 transformationProjection; +uniform highp mat3 transformationProjection; #ifdef EXPLICIT_ATTRIB_LOCATION -layout(location = 0) in vec3 position; +layout(location = 0) in highp vec3 position; #else -in vec3 position; +in highp vec3 position; #endif void main() { diff --git a/src/Shaders/PhongShader.frag b/src/Shaders/PhongShader.frag index 638a1e3fa..aa8125401 100644 --- a/src/Shaders/PhongShader.frag +++ b/src/Shaders/PhongShader.frag @@ -3,35 +3,35 @@ #define color gl_FragColor #endif -uniform vec3 ambientColor = vec3(0.0, 0.0, 0.0); -uniform vec3 diffuseColor; -uniform vec3 specularColor = vec3(1.0, 1.0, 1.0); -uniform vec3 lightColor = vec3(1.0, 1.0, 1.0); -uniform float shininess = 80.0; +uniform lowp vec3 ambientColor = vec3(0.0, 0.0, 0.0); +uniform lowp vec3 diffuseColor; +uniform lowp vec3 specularColor = vec3(1.0, 1.0, 1.0); +uniform lowp vec3 lightColor = vec3(1.0, 1.0, 1.0); +uniform mediump float shininess = 80.0; -in vec3 transformedNormal; -in vec3 lightDirection; -in vec3 cameraDirection; +in mediump vec3 transformedNormal; +in highp vec3 lightDirection; +in highp vec3 cameraDirection; #ifdef NEW_GLSL -out vec4 color; +out lowp vec4 color; #endif void main() { /* Ambient color */ color.rgb = ambientColor; - vec3 normalizedTransformedNormal = normalize(transformedNormal); - vec3 normalizedLightDirection = normalize(lightDirection); + mediump vec3 normalizedTransformedNormal = normalize(transformedNormal); + highp vec3 normalizedLightDirection = normalize(lightDirection); /* Add diffuse color */ - float intensity = max(0.0, dot(normalizedTransformedNormal, normalizedLightDirection)); + lowp float intensity = max(0.0, dot(normalizedTransformedNormal, normalizedLightDirection)); color.rgb += diffuseColor*lightColor*intensity; /* Add specular color, if needed */ if(intensity != 0) { - vec3 reflection = reflect(-normalizedLightDirection, normalizedTransformedNormal); - float specularity = pow(max(0.0, dot(normalize(cameraDirection), reflection)), shininess); + highp vec3 reflection = reflect(-normalizedLightDirection, normalizedTransformedNormal); + mediump float specularity = pow(max(0.0, dot(normalize(cameraDirection), reflection)), shininess); color.rgb += specularColor*specularity; } diff --git a/src/Shaders/PhongShader.vert b/src/Shaders/PhongShader.vert index 1c794cbce..b544d63f8 100644 --- a/src/Shaders/PhongShader.vert +++ b/src/Shaders/PhongShader.vert @@ -3,26 +3,26 @@ #define out varying #endif -uniform mat4 transformationMatrix; -uniform mat4 projectionMatrix; -uniform vec3 light; +uniform highp mat4 transformationMatrix; +uniform highp mat4 projectionMatrix; +uniform highp vec3 light; #ifdef EXPLICIT_ATTRIB_LOCATION -layout(location = 0) in vec4 position; -layout(location = 1) in vec3 normal; +layout(location = 0) in highp vec4 position; +layout(location = 1) in mediump vec3 normal; #else -in vec4 position; -in vec3 normal; +in highp vec4 position; +in mediump vec3 normal; #endif -out vec3 transformedNormal; -out vec3 lightDirection; -out vec3 cameraDirection; +out mediump vec3 transformedNormal; +out highp vec3 lightDirection; +out highp vec3 cameraDirection; void main() { /* Transformed vertex position */ - vec4 transformedPosition4 = transformationMatrix*position; - vec3 transformedPosition = transformedPosition4.xyz/transformedPosition4.w; + highp vec4 transformedPosition4 = transformationMatrix*position; + highp vec3 transformedPosition = transformedPosition4.xyz/transformedPosition4.w; /* Transformed normal vector */ transformedNormal = normalize(mat3x3(transformationMatrix)*normal); diff --git a/src/Shaders/compatibility.glsl b/src/Shaders/compatibility.glsl index 2ccbfae6b..70f4cd6ba 100644 --- a/src/Shaders/compatibility.glsl +++ b/src/Shaders/compatibility.glsl @@ -12,3 +12,10 @@ #if defined(GL_ES) && __VERSION__ >= 300 #define EXPLICIT_ATTRIB_LOCATION #endif + +/* Precision qualifiers are not supported in GLSL 1.20 */ +#if !defined(GL_ES) && __VERSION__ == 120 +#define highp +#define mediump +#define lowp +#endif From 17ee1d7fd8c10e08362ffa47810e26854c4e9ee0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 10 Nov 2012 21:28:45 +0100 Subject: [PATCH 10/18] Shaders: portable vertex color shader (currently 2D only). --- src/Shaders/CMakeLists.txt | 3 ++ src/Shaders/VertexColorShader.cpp | 75 ++++++++++++++++++++++++++++ src/Shaders/VertexColorShader.h | 69 +++++++++++++++++++++++++ src/Shaders/VertexColorShader2D.frag | 14 ++++++ src/Shaders/VertexColorShader2D.vert | 21 ++++++++ 5 files changed, 182 insertions(+) create mode 100644 src/Shaders/VertexColorShader.cpp create mode 100644 src/Shaders/VertexColorShader.h create mode 100644 src/Shaders/VertexColorShader2D.frag create mode 100644 src/Shaders/VertexColorShader2D.vert diff --git a/src/Shaders/CMakeLists.txt b/src/Shaders/CMakeLists.txt index 38a3ce0ad..46139bbed 100644 --- a/src/Shaders/CMakeLists.txt +++ b/src/Shaders/CMakeLists.txt @@ -1,14 +1,17 @@ corrade_add_resource(MagnumShaders_RCS MagnumShaders FlatShader2D.vert FlatShader2D.frag PhongShader.vert PhongShader.frag + VertexColorShader2D.vert VertexColorShader2D.frag compatibility.glsl) set(MagnumShaders_SRCS FlatShader.cpp PhongShader.cpp + VertexColorShader.cpp ${MagnumShaders_RCS}) set(MagnumShaders_HEADERS FlatShader.h PhongShader.h + VertexColorShader.h magnumShadersVisibility.h) diff --git a/src/Shaders/VertexColorShader.cpp b/src/Shaders/VertexColorShader.cpp new file mode 100644 index 000000000..bb6305b4d --- /dev/null +++ b/src/Shaders/VertexColorShader.cpp @@ -0,0 +1,75 @@ +/* + Copyright © 2010, 2011, 2012 Vladimír Vondruš + + This file is part of Magnum. + + Magnum is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License version 3 + only, as published by the Free Software Foundation. + + Magnum is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License version 3 for more details. +*/ + +#include "VertexColorShader.h" + +#include + +#include "Extensions.h" +#include "Shader.h" + +namespace Magnum { namespace Shaders { + +namespace { + template struct ShaderName {}; + + template<> struct ShaderName<2> { + constexpr static const char* vertex() { return "VertexColorShader2D.vert"; } + constexpr static const char* fragment() { return "VertexColorShader2D.frag"; } + }; + + template<> struct ShaderName<3> { + constexpr static const char* vertex() { return "VertexColorShader3D.vert"; } + constexpr static const char* fragment() { return "VertexColorShader3D.frag"; } + }; +} + +template VertexColorShader::VertexColorShader() { + Corrade::Utility::Resource rs("MagnumShaders"); + + #ifndef MAGNUM_TARGET_GLES + Version v = Context::current()->supportedVersion({Version::GL320, Version::GL210}); + #else + Version v = Context::current()->supportedVersion({Version::GLES300, Version::GLES200}); + #endif + + Shader vertexShader(v, Shader::Type::Vertex); + vertexShader.addSource(rs.get("compatibility.glsl")); + vertexShader.addSource(rs.get(ShaderName::vertex())); + attachShader(vertexShader); + + Shader fragmentShader(v, Shader::Type::Fragment); + fragmentShader.addSource(rs.get("compatibility.glsl")); + fragmentShader.addSource(rs.get(ShaderName::fragment())); + attachShader(fragmentShader); + + #ifndef MAGNUM_TARGET_GLES + if(!Context::current()->isExtensionSupported()) { + #else + if(!Context::current()->isVersionSupported(Version::GLES300)) { + #endif + bindAttributeLocation(Position::Location, "position"); + bindAttributeLocation(Color::Location, "color"); + } + + link(); + + transformationProjectionUniform = uniformLocation("transformationProjection"); +} + +template class VertexColorShader<2>; +template class VertexColorShader<3>; + +}} diff --git a/src/Shaders/VertexColorShader.h b/src/Shaders/VertexColorShader.h new file mode 100644 index 000000000..4fa87b65d --- /dev/null +++ b/src/Shaders/VertexColorShader.h @@ -0,0 +1,69 @@ +#ifndef Magnum_Shaders_VertexColorShader_h +#define Magnum_Shaders_VertexColorShader_h +/* + Copyright © 2010, 2011, 2012 Vladimír Vondruš + + This file is part of Magnum. + + Magnum is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License version 3 + only, as published by the Free Software Foundation. + + Magnum is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License version 3 for more details. +*/ + +/** @file + * @brief Class Magnum::Shaders::VertexColorShader + */ + +#include "Math/Matrix3.h" +#include "Math/Matrix4.h" +#include "AbstractShaderProgram.h" +#include "Color.h" +#include "DimensionTraits.h" + +#include "magnumShadersVisibility.h" + +namespace Magnum { namespace Shaders { + +/** +@brief Vertex color shader + +Draws vertex-colored mesh. +@see VertexColorShader2D, VertexColorShader3D +*/ +template class SHADERS_EXPORT VertexColorShader: public AbstractShaderProgram { + public: + /** @brief Vertex position */ + typedef Attribute<0, typename DimensionTraits::PointType> Position; + + /** @brief Vertex color */ + typedef Attribute<1, Math::Point2D> Color; + + VertexColorShader(); + + /** + * @brief Set transformation and projection + * @return Pointer to self (for method chaining) + */ + inline VertexColorShader* setTransformationProjection(const typename DimensionTraits::MatrixType& matrix) { + setUniform(transformationProjectionUniform, matrix); + return this; + } + + private: + GLint transformationProjectionUniform; +}; + +/** @brief 2D vertex color shader */ +typedef VertexColorShader<2> VertexColorShader2D; + +/** @brief 3D vertex color shader */ +typedef VertexColorShader<3> VertexColorShader3D; + +}} + +#endif diff --git a/src/Shaders/VertexColorShader2D.frag b/src/Shaders/VertexColorShader2D.frag new file mode 100644 index 000000000..641dd081e --- /dev/null +++ b/src/Shaders/VertexColorShader2D.frag @@ -0,0 +1,14 @@ +#ifndef NEW_GLSL +#define in varying +#define fragmentColor gl_FragColor +#endif + +in lowp vec3 interpolatedColor; + +#ifdef NEW_GLSL +out lowp vec4 fragmentColor; +#endif + +void main() { + fragmentColor = vec4(interpolatedColor, 1.0); +} diff --git a/src/Shaders/VertexColorShader2D.vert b/src/Shaders/VertexColorShader2D.vert new file mode 100644 index 000000000..12be1d046 --- /dev/null +++ b/src/Shaders/VertexColorShader2D.vert @@ -0,0 +1,21 @@ +#ifndef NEW_GLSL +#define in attribute +#define out varying +#endif + +uniform highp mat3 transformationProjection; + +#ifdef EXPLICIT_ATTRIB_LOCATION +layout(location = 0) in highp vec3 position; +layout(location = 1) in lowp vec3 color; +#else +in highp vec3 position; +in lowp vec3 color; +#endif + +out lowp vec3 interpolatedColor; + +void main() { + gl_Position.xywz = vec4(transformationProjection*position, 0.0); + interpolatedColor = color; +} From 5d72cdc6a6a1825aa3ae5c38712911cfcdaf02ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 10 Nov 2012 21:55:02 +0100 Subject: [PATCH 11/18] Updated toolchains submodule with NaCl support. --- toolchains | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchains b/toolchains index d075b128d..bbde13017 160000 --- a/toolchains +++ b/toolchains @@ -1 +1 @@ -Subproject commit d075b128dc209f5b172d9969ca36dc532cc31c2e +Subproject commit bbde1301797c86a87a93617a094d88ab4a0dda0a From ae9914c5878e2ccbffe878950dfddbcc3c351237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 10 Nov 2012 21:59:42 +0100 Subject: [PATCH 12/18] Provide information about compatibility and ES 2.0 target to users. --- modules/FindMagnum.cmake | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake index 76175adcc..51d0311f6 100644 --- a/modules/FindMagnum.cmake +++ b/modules/FindMagnum.cmake @@ -65,11 +65,21 @@ find_path(MAGNUM_INCLUDE_DIR # Configuration file(READ ${MAGNUM_INCLUDE_DIR}/magnumConfigure.h _magnumConfigure) -# Built for OpenGL ES? +# Compatibility? +string(FIND "${_magnumConfigure}" "#define MAGNUM_GCC46_COMPATIBILITY" _GCC46_COMPATIBILITY) +if(NOT _GCC46_COMPATIBILITY EQUAL -1) + set(MAGNUM_GCC46_COMPATIBILITY 1) +endif() + +# Built for specific target? string(FIND "${_magnumConfigure}" "#define MAGNUM_TARGET_GLES" _TARGET_GLES) if(NOT _TARGET_GLES EQUAL -1) set(MAGNUM_TARGET_GLES 1) endif() +string(FIND "${_magnumConfigure}" "#define MAGNUM_TARGET_GLES2" _TARGET_GLES2) +if(NOT _TARGET_GLES2 EQUAL -1) + set(MAGNUM_TARGET_GLES2 1) +endif() if(NOT MAGNUM_TARGET_GLES) find_package(OpenGL REQUIRED) From 4d3dd19b9d55ce9240ffaa628440dbe61ac599fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 10 Nov 2012 21:55:29 +0100 Subject: [PATCH 13/18] Initial NaCl support. * Explicitly set OpenGL ES 2.0 support. * Provide information about NaCl target to users. --- CMakeLists.txt | 7 +++++++ modules/FindMagnum.cmake | 4 ++++ src/magnumConfigure.h.cmake | 1 + 3 files changed, 12 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5713f9a8c..b0853ba78 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,6 +30,13 @@ endif() set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${Magnum_SOURCE_DIR}/modules/") +# If targetting NaCl, set explicit OpenGL ES 2.0 support +if(${CMAKE_SYSTEM_NAME} STREQUAL NaCl) + set(TARGET_GLES 1) + set(TARGET_GLES2 1) + set(MAGNUM_TARGET_NACL 1) +endif() + # Check dependencies find_package(Corrade REQUIRED) if(NOT TARGET_GLES) diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake index 51d0311f6..24fb74479 100644 --- a/modules/FindMagnum.cmake +++ b/modules/FindMagnum.cmake @@ -80,6 +80,10 @@ string(FIND "${_magnumConfigure}" "#define MAGNUM_TARGET_GLES2" _TARGET_GLES2) if(NOT _TARGET_GLES2 EQUAL -1) set(MAGNUM_TARGET_GLES2 1) endif() +string(FIND "${_magnumConfigure}" "#define MAGNUM_TARGET_NACL" _TARGET_NACL) +if(NOT _TARGET_NACL EQUAL -1) + set(MAGNUM_TARGET_NACL 1) +endif() if(NOT MAGNUM_TARGET_GLES) find_package(OpenGL REQUIRED) diff --git a/src/magnumConfigure.h.cmake b/src/magnumConfigure.h.cmake index a2d1d818f..3296b3c10 100644 --- a/src/magnumConfigure.h.cmake +++ b/src/magnumConfigure.h.cmake @@ -1,3 +1,4 @@ +#cmakedefine MAGNUM_TARGET_NACL #cmakedefine MAGNUM_TARGET_GLES #cmakedefine MAGNUM_TARGET_GLES2 #cmakedefine MAGNUM_GCC46_COMPATIBILITY From e1cd13021ba6158642845a01c78685385a806f5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 10 Nov 2012 22:35:11 +0100 Subject: [PATCH 14/18] Platform/Application renaming. Because with NaCl WindowContext doesn't make sense anymore, the classes are now renamed: * Contexts namespace -> Platform * *WindowContext -> Application Hopefully this is (one of) last crazy renaming runs. --- CMakeLists.txt | 8 +- README.md | 10 +- doc/building.dox | 22 ++--- doc/mainpage.dox | 4 +- doc/namespaces.dox | 10 +- modules/FindMagnum.cmake | 36 +++---- src/CMakeLists.txt | 2 +- src/Contexts/CMakeLists.txt | 93 ------------------- .../AbstractApplication.h} | 20 ++-- .../AbstractContextHandler.h | 8 +- .../AbstractXApplication.cpp} | 10 +- .../AbstractXApplication.h} | 40 ++++---- src/Platform/CMakeLists.txt | 93 +++++++++++++++++++ .../EglContextHandler.cpp | 2 +- .../EglContextHandler.h | 12 +-- .../ExtensionWrangler.cpp | 2 +- .../ExtensionWrangler.h | 8 +- .../GlutApplication.cpp} | 10 +- .../GlutApplication.h} | 28 +++--- .../GlxApplication.h} | 16 ++-- .../GlxContextHandler.cpp | 2 +- .../GlxContextHandler.h | 12 +-- .../Sdl2Application.cpp} | 10 +- .../Sdl2Application.h} | 38 ++++---- .../XEglApplication.h} | 16 ++-- src/Profiler.h | 2 +- 26 files changed, 257 insertions(+), 257 deletions(-) delete mode 100644 src/Contexts/CMakeLists.txt rename src/{Contexts/AbstractWindowContext.h => Platform/AbstractApplication.h} (64%) rename src/{Contexts => Platform}/AbstractContextHandler.h (89%) rename src/{Contexts/AbstractXWindowContext.cpp => Platform/AbstractXApplication.cpp} (91%) rename src/{Contexts/AbstractXWindowContext.h => Platform/AbstractXApplication.h} (88%) create mode 100644 src/Platform/CMakeLists.txt rename src/{Contexts => Platform}/EglContextHandler.cpp (98%) rename src/{Contexts => Platform}/EglContextHandler.h (88%) rename src/{Contexts => Platform}/ExtensionWrangler.cpp (96%) rename src/{Contexts => Platform}/ExtensionWrangler.h (84%) rename src/{Contexts/GlutWindowContext.cpp => Platform/GlutApplication.cpp} (80%) rename src/{Contexts/GlutWindowContext.h => Platform/GlutApplication.h} (90%) rename src/{Contexts/GlxWindowContext.h => Platform/GlxApplication.h} (66%) rename src/{Contexts => Platform}/GlxContextHandler.cpp (98%) rename src/{Contexts => Platform}/GlxContextHandler.h (88%) rename src/{Contexts/Sdl2WindowContext.cpp => Platform/Sdl2Application.cpp} (93%) rename src/{Contexts/Sdl2WindowContext.h => Platform/Sdl2Application.h} (83%) rename src/{Contexts/XEglWindowContext.h => Platform/XEglApplication.h} (64%) diff --git a/CMakeLists.txt b/CMakeLists.txt index b0853ba78..17a27416c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,10 +17,10 @@ cmake_dependent_option(WITH_PRIMITIVES "Builf Primitives library" OFF "NOT WITH_ cmake_dependent_option(WITH_SCENEGRAPH "Build SceneGraph library" OFF "NOT WITH_EVERYTHING;NOT WITH_PHYSICS" ON) cmake_dependent_option(WITH_SHADERS "Build Shaders library" OFF "NOT WITH_EVERYTHING;NOT WITH_PHYSICS" ON) -option(WITH_GLXWINDOWCONTEXT "Build GlxWindowContext library" OFF) -cmake_dependent_option(WITH_XEGLWINDOWCONTEXT "Build XEglWindowContext library" OFF "TARGET_GLES" OFF) -cmake_dependent_option(WITH_GLUTWINDOWCONTEXT "Build GlutWindowContext library" OFF "NOT TARGET_GLES" OFF) -option(WITH_SDL2WINDOWCONTEXT "Build Sdl2WindowContext library" OFF) +option(WITH_GLXAPPLICATION "Build GlxApplication library" OFF) +cmake_dependent_option(WITH_XEGLAPPLICATION "Build XEglApplication library" OFF "TARGET_GLES" OFF) +cmake_dependent_option(WITH_GLUTAPPLICATION "Build GlutApplication library" OFF "NOT TARGET_GLES" OFF) +option(WITH_SDL2APPLICATION "Build Sdl2Application library" OFF) option(BUILD_TESTS "Build unit tests." OFF) diff --git a/README.md b/README.md index 9ed0bed4f..3eb2cc4fa 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,8 @@ Features: * Plugin-based data exchange framework for importing image, mesh, material and scene data in various formats. * Collection of pre-made graphic primitives and shaders for testing purposes. - * Classes for easy creation of OpenGL context with various toolkits, methods - for querying supported OpenGL version and available extensions. + * Classes for creating OpenGL-enabled applications with various toolkits, + methods for querying supported OpenGL version and available extensions. * Comprehensive use of C++11 features for safety, performance and ease of development. All code which doesn't directly interact with OpenGL is covered with unit tests. @@ -45,13 +45,13 @@ Minimal dependencies Compilation, installation ------------------------- -The library (for example with GLUT window context) can be built and installed -using these four commands: +The library (for example with support for GLUT applications) can be built and +installed using these four commands: mkdir -p build && cd build cmake .. \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_GLUTWINDOWCONTEXT=ON + -DWITH_GLUTAPPLICATION=ON make make install diff --git a/doc/building.dox b/doc/building.dox index a3beb30d6..52a1c25ad 100644 --- a/doc/building.dox +++ b/doc/building.dox @@ -37,14 +37,14 @@ subdirectory: git submodule update @section building-compilation Compilation, installation -The library (for example with GLUT window context) can be built and installed -using these four commands. See below for more information about optional -features. +The library (for example with support for GLUT applications) can be built and +installed using these four commands. See below for more information about +optional features. mkdir -p build && cd build cmake .. \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_GLUTWINDOWCONTEXT=ON + -DWITH_GLUTAPPLICATION=ON make make install @@ -57,7 +57,7 @@ OpenGL ES, set `TARGET_GLES` to `ON` or pass `-DTARGET_GLES=ON` to CMake. Note that some features are available for desktop OpenGL only, see @ref requires-gl. By default the engine is built with everything except -@ref Contexts "context libraries". Using `WITH_*` CMake parameters you can +@ref Platform "application libraries". Using `WITH_*` CMake parameters you can specify which parts will be built and which not: - `WITH_EVERYTHING` - Defaults to `ON`, builds everything except window @@ -68,16 +68,16 @@ specify which parts will be built and which not: - `WITH_PRIMITIVES` - Primitives library. - `WITH_SHADERS` - Shaders library. -None of the window context libraries is built by default, regardless to +None of the application libraries is built by default, regardless to `WITH_EVERYTHING` is enabled or not: - - `WITH_XEGLWINDOWCONTEXT` - X/EGL window context, available only if - targeting OpenGL ES (see above). Requires **X11** and **EGL** libraries. - - `WITH_GLXWINDOWCONTEXT` - GLX window context. Requires **X11** and **GLX** + - `WITH_XEGLAPPLICATION` - X/EGL application, available only if targeting + OpenGL ES (see above). Requires **X11** and **EGL** libraries. + - `WITH_GLXAPPLICATION` - GLX application. Requires **X11** and **GLX** libraries. - - `WITH_GLUTWINDOWCONTEXT` - GLUT window context, available only if targeting + - `WITH_GLUTAPPLICATION` - GLUT application, available only if targeting desktop OpenGL. Requires **GLUT** library. - - `WITH_SDL2WINDOWCONTEXT` - SDL2 window context. Requires **SDL2** library. + - `WITH_SDL2APPLICATION` - SDL2 application. Requires **SDL2** library. @subsection building-tests Building and running unit tests If you want to build also unit tests (which are not built by default), pass diff --git a/doc/mainpage.dox b/doc/mainpage.dox index 3894d8a1f..b262155a7 100644 --- a/doc/mainpage.dox +++ b/doc/mainpage.dox @@ -21,7 +21,7 @@ Features: material and scene data in various formats. - Collection of pre-made @ref Primitives "graphic primitives" and @ref Shaders "shaders" for testing purposes. -- Classes for easy creation of OpenGL context with @ref Contexts +- Classes for creating OpenGL-enabled applications with @ref Platform "various toolkits", methods for querying @ref Context "supported OpenGL version and available extensions". - Comprehensive use of C++11 features for safety, performance and ease of @@ -41,7 +41,7 @@ Guide @ref building "how to download and build Magnum" on different platforms. To get up and running, you must first subclass one of the provided window context classes and implement required functions. %Magnum provides implementations for the most common toolkits (such as GLUT, Xlib, or SDL2) in -Contexts namespace. +Platform namespace. Then you can either draw your meshes directly or use SceneGraph which will help you with object hierarchy, transformations and resource management. diff --git a/doc/namespaces.dox b/doc/namespaces.dox index 4794c670e..7e0f7c08e 100644 --- a/doc/namespaces.dox +++ b/doc/namespaces.dox @@ -10,13 +10,13 @@ Contains classes for interacting with OpenGL. */ -/** @dir Contexts - * @brief Namespace Magnum::Contexts +/** @dir Platform + * @brief Namespace Magnum::Platform */ -/** @namespace Magnum::Contexts -@brief Context creation +/** @namespace Magnum::Platform +@brief Platform-specific application and context creation -Base classes for creating OpenGL contexts with various toolkits. +Base classes for creating applications with various toolkits. */ /** @dir Math diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake index 24fb74479..d325250f6 100644 --- a/modules/FindMagnum.cmake +++ b/modules/FindMagnum.cmake @@ -21,13 +21,13 @@ # Primitives - Library with stock geometric primitives (static) # SceneGraph - Scene graph library # Shaders - Library with stock shaders -# GlxContext - GLX context (depends on X11 libraries) -# XEglContext - X/EGL context (depends on EGL and X11 libraries) -# GlutContext - GLUT context (depends on GLUT library) -# Sdl2Context - SDL2 context (depends on SDL2 library) +# GlxApplication - GLX application (depends on X11 libraries) +# XEglApplication - X/EGL application (depends on EGL and X11 libraries) +# GlutApplication - GLUT application (depends on GLUT library) +# Sdl2Application - SDL2 application (depends on SDL2 library) # Example usage with specifying additional components is: # find_package(Magnum [REQUIRED|COMPONENTS] -# MeshTools Primitives GlutContext) +# MeshTools Primitives GlutApplication) # For each component is then defined: # MAGNUM_*_FOUND - Whether the component was found # MAGNUM_*_LIBRARIES - Component library and dependent libraries @@ -92,8 +92,8 @@ else() find_package(OpenGLES2 REQUIRED) endif() -# On Windows, *WindowContext libraries need to have ${MAGNUM_LIBRARY} listed -# in dependencies also after *WindowContext.lib static library name to avoid +# On Windows, *Application libraries need to have ${MAGNUM_LIBRARY} listed +# in dependencies also after *Application.lib static library name to avoid # linker errors if(WIN32) set(_WINDOWCONTEXT_MAGNUM_LIBRARY_DEPENDENCY ${MAGNUM_LIBRARY}) @@ -108,13 +108,13 @@ foreach(component ${Magnum_FIND_COMPONENTS}) set(_MAGNUM_${_COMPONENT}_INCLUDE_PATH_SUFFIX ${component}) - # Window contexts - if(${component} MATCHES .+WindowContext) - set(_MAGNUM_${_COMPONENT}_INCLUDE_PATH_SUFFIX Contexts) + # Applications + if(${component} MATCHES .+Application) + set(_MAGNUM_${_COMPONENT}_INCLUDE_PATH_SUFFIX Platform) set(_MAGNUM_${_COMPONENT}_INCLUDE_PATH_NAMES ${component}.h) - # GLUT window context dependencies - if(${component} STREQUAL GlutWindowContext) + # GLUT application dependencies + if(${component} STREQUAL GlutApplication) find_package(GLUT) if(GLUT_FOUND) set(_MAGNUM_${_COMPONENT}_LIBRARIES ${GLUT_LIBRARIES} ${_WINDOWCONTEXT_MAGNUM_LIBRARY_DEPENDENCY}) @@ -123,8 +123,8 @@ foreach(component ${Magnum_FIND_COMPONENTS}) endif() endif() - # SDL2 window context dependencies - if(${component} STREQUAL Sdl2WindowContext) + # SDL2 application dependencies + if(${component} STREQUAL Sdl2Application) find_package(SDL2) if(SDL2_FOUND) set(_MAGNUM_${_COMPONENT}_LIBRARIES ${SDL2_LIBRARY} ${_WINDOWCONTEXT_MAGNUM_LIBRARY_DEPENDENCY}) @@ -134,8 +134,8 @@ foreach(component ${Magnum_FIND_COMPONENTS}) endif() endif() - # GLX window context dependencies - if(${component} STREQUAL GlxWindowContext) + # GLX application dependencies + if(${component} STREQUAL GlxApplication) find_package(X11) if(X11_FOUND) set(_MAGNUM_${_COMPONENT}_LIBRARIES ${X11_LIBRARIES} ${_WINDOWCONTEXT_MAGNUM_LIBRARY_DEPENDENCY}) @@ -144,8 +144,8 @@ foreach(component ${Magnum_FIND_COMPONENTS}) endif() endif() - # X/EGL window context dependencies - if(${component} STREQUAL XEglWindowContext) + # X/EGL application dependencies + if(${component} STREQUAL XEglApplication) find_package(EGL) find_package(X11) if(EGL_FOUND AND X11_FOUND) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ac2aac236..bc81ad9f1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -124,7 +124,7 @@ install(FILES ${Magnum_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}) # Install also configure file install(FILES ${CMAKE_CURRENT_BINARY_DIR}/magnumConfigure.h DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}) -add_subdirectory(Contexts) +add_subdirectory(Platform) add_subdirectory(Math) add_subdirectory(Trade) diff --git a/src/Contexts/CMakeLists.txt b/src/Contexts/CMakeLists.txt deleted file mode 100644 index f11098375..000000000 --- a/src/Contexts/CMakeLists.txt +++ /dev/null @@ -1,93 +0,0 @@ -# Extension wrangler -add_library(MagnumContextsExtensionWrangler OBJECT ExtensionWrangler.cpp) - -set(MagnumContexts_HEADERS - AbstractContextHandler.h - AbstractWindowContext.h - ExtensionWrangler.h) -install(FILES ${MagnumContexts_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Contexts) - -# GLUT window context -if(WITH_GLUTWINDOWCONTEXT) - find_package(GLUT) - if(GLUT_FOUND) - add_library(MagnumGlutWindowContext STATIC - GlutWindowContext.cpp - $) - install(FILES GlutWindowContext.h DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Contexts) - install(TARGETS MagnumGlutWindowContext DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}) - else() - message(FATAL_ERROR "GLUT library, required by GlutWindowContext, was not found. Set WITH_GLUTWINDOWCONTEXT to OFF to skip building it.") - endif() -endif() - -# SDL2 window context -if(WITH_SDL2WINDOWCONTEXT) - find_package(SDL2) - if(SDL2_FOUND) - include_directories(${SDL2_INCLUDE_DIR}) - add_library(MagnumSdl2WindowContext STATIC - Sdl2WindowContext.cpp - $) - install(FILES Sdl2WindowContext.h DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Contexts) - install(TARGETS MagnumSdl2WindowContext DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}) - else() - message(FATAL_ERROR "SDL2 library, required by Sdl2WindowContext, was not found. Set WITH_SDL2WINDOWCONTEXT to OFF to skip building it.") - endif() -endif() - -# GLX window context -if(WITH_GLXWINDOWCONTEXT) - set(NEED_ABSTRACTXWINDOWCONTEXT 1) - set(NEED_GLXCONTEXT 1) - add_library(MagnumGlxWindowContext STATIC - $ - $ - $) - install(FILES GlxWindowContext.h DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Contexts) - install(TARGETS MagnumGlxWindowContext DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}) -endif() - -# X/EGL window context -if(WITH_XEGLWINDOWCONTEXT) - set(NEED_ABSTRACTXWINDOWCONTEXT 1) - set(NEED_EGLCONTEXT 1) - add_library(MagnumXEglWindowContext STATIC - $ - $ - $) - install(FILES XEglWindowContext.h DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Contexts) - install(TARGETS MagnumXEglWindowContext DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}) -endif() - -# Abstract X window context -if(NEED_ABSTRACTXWINDOWCONTEXT) - find_package(X11) - if(NOT X11_FOUND) - message(FATAL_ERROR "X11 library, required by some contexts, was not found. Set WITH_*X*WINDOWCONTEXT to OFF to skip building them.") - endif() - add_library(MagnumAbstractXWindowContext OBJECT AbstractXWindowContext.cpp) - # X11 macros are a mess, disable warnings for C-style casts - set_target_properties(MagnumAbstractXWindowContext PROPERTIES COMPILE_FLAGS "-Wno-old-style-cast") - install(FILES AbstractXWindowContext.h DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Contexts) -endif() - -# GLX context -if(NEED_GLXCONTEXT) - add_library(MagnumGlxContextHandler OBJECT GlxContextHandler.cpp) - # X11 macros are a mess, disable warnings for C-style casts - set_target_properties(MagnumGlxContextHandler PROPERTIES COMPILE_FLAGS "-Wno-old-style-cast") - install(FILES GlxContextHandler.h DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Contexts) -endif() - -# EGL context -if(NEED_EGLCONTEXT) - find_package(EGL) - if(NOT EGL_FOUND) - message(FATAL_ERROR "EGL library, required by some window contexts, was not found. Set WITH_*EGL*WINDOWCONTEXT to OFF to skip building them.") - endif() - add_library(MagnumEglContextHandler OBJECT EglContextHandler.cpp) - # X11 macros are a mess, disable warnings for C-style casts - set_target_properties(MagnumEglContextHandler PROPERTIES COMPILE_FLAGS "-Wno-old-style-cast") - install(FILES EglContextHandler.h DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Contexts) -endif() diff --git a/src/Contexts/AbstractWindowContext.h b/src/Platform/AbstractApplication.h similarity index 64% rename from src/Contexts/AbstractWindowContext.h rename to src/Platform/AbstractApplication.h index 8d5b0ba78..5a5025818 100644 --- a/src/Contexts/AbstractWindowContext.h +++ b/src/Platform/AbstractApplication.h @@ -1,5 +1,5 @@ -#ifndef Magnum_Contexts_AbstractWindowContext_h -#define Magnum_Contexts_AbstractWindowContext_h +#ifndef Magnum_Platform_AbstractApplication_h +#define Magnum_Platform_AbstractApplication_h /* Copyright © 2010, 2011, 2012 Vladimír Vondruš @@ -16,18 +16,18 @@ */ /** @file - * @brief Class Magnum::Contexts::AbstractWindowContext + * @brief Class Magnum::Platform::AbstractApplication */ -namespace Magnum { namespace Contexts { +namespace Magnum { namespace Platform { /** -@brief Base class for context creation +@brief Base class for applications -See subclasses documentation for more information. Context classes subclasses -are meant to be used directly in `main()`, for example: +See subclasses documentation for more information. Subclasses are meant to be +used directly in `main()`, for example: @code -class MyContext: public Magnum::Contexts::GlutWindowContext { +class MyContext: public Magnum::Platform::GlutApplication { // implement required methods... }; int main(int argc, char** argv) { @@ -36,9 +36,9 @@ int main(int argc, char** argv) { } @endcode */ -class AbstractWindowContext { +class AbstractApplication { public: - virtual inline ~AbstractWindowContext() {} + virtual inline ~AbstractApplication() {} /** * @brief Execute main loop diff --git a/src/Contexts/AbstractContextHandler.h b/src/Platform/AbstractContextHandler.h similarity index 89% rename from src/Contexts/AbstractContextHandler.h rename to src/Platform/AbstractContextHandler.h index ba73aa940..81adb561b 100644 --- a/src/Contexts/AbstractContextHandler.h +++ b/src/Platform/AbstractContextHandler.h @@ -1,5 +1,5 @@ -#ifndef Magnum_Contexts_AbstractContextHandler_h -#define Magnum_Contexts_AbstractContextHandler_h +#ifndef Magnum_Platform_AbstractContextHandler_h +#define Magnum_Platform_AbstractContextHandler_h /* Copyright © 2010, 2011, 2012 Vladimír Vondruš @@ -16,12 +16,12 @@ */ /** @file - * @brief Class Magnum::Contexts::AbstractContextHandler + * @brief Class Magnum::Platform::AbstractContextHandler */ #include "ExtensionWrangler.h" -namespace Magnum { namespace Contexts { +namespace Magnum { namespace Platform { /** @brief Base for OpenGL context handlers */ template class AbstractContextHandler { diff --git a/src/Contexts/AbstractXWindowContext.cpp b/src/Platform/AbstractXApplication.cpp similarity index 91% rename from src/Contexts/AbstractXWindowContext.cpp rename to src/Platform/AbstractXApplication.cpp index 0fbb95a9e..50948e61b 100644 --- a/src/Contexts/AbstractXWindowContext.cpp +++ b/src/Platform/AbstractXApplication.cpp @@ -13,7 +13,7 @@ GNU Lesser General Public License version 3 for more details. */ -#include "AbstractXWindowContext.h" +#include "AbstractXApplication.h" #include "Context.h" #include "ExtensionWrangler.h" @@ -25,9 +25,9 @@ using namespace std; -namespace Magnum { namespace Contexts { +namespace Magnum { namespace Platform { -AbstractXWindowContext::AbstractXWindowContext(AbstractContextHandler* contextHandler, int&, char**, const string& title, const Math::Vector2& size): contextHandler(contextHandler), viewportSize(size), flags(Flag::Redraw) { +AbstractXApplication::AbstractXApplication(AbstractContextHandler* contextHandler, int&, char**, const string& title, const Math::Vector2& size): contextHandler(contextHandler), viewportSize(size), flags(Flag::Redraw) { /* Get default X display */ display = XOpenDisplay(0); @@ -75,7 +75,7 @@ AbstractXWindowContext::AbstractXWindowContext(AbstractContextHandler @@ -16,7 +16,7 @@ */ /** @file - * @brief Class Magnum::Contexts::AbstractXWindowContext + * @brief Class Magnum::Platform::AbstractXApplication */ #include @@ -30,7 +30,7 @@ #undef Always #include "Math/Vector2.h" -#include "AbstractWindowContext.h" +#include "AbstractApplication.h" #include "AbstractContextHandler.h" #include "magnumCompatibility.h" @@ -39,16 +39,16 @@ namespace Magnum { class Context; -namespace Contexts { +namespace Platform { /** @nosubgrouping -@brief Base for X11-based contexts +@brief Base for X11-based applications Supports keyboard and mouse handling. @note Not meant to be used directly, see subclasses. */ -class AbstractXWindowContext: public AbstractWindowContext { +class AbstractXApplication: public AbstractApplication { public: /** * @brief Constructor @@ -60,14 +60,14 @@ class AbstractXWindowContext: public AbstractWindowContext { * * Creates window with double-buffered OpenGL ES 2 context. */ - AbstractXWindowContext(AbstractContextHandler* contextHandler, int& argc, char** argv, const std::string& title = "Magnum X window context", const Math::Vector2& size = Math::Vector2(800, 600)); + AbstractXApplication(AbstractContextHandler* contextHandler, int& argc, char** argv, const std::string& title = "Magnum X application", const Math::Vector2& size = Math::Vector2(800, 600)); /** * @brief Destructor * * Deletes context and destroys the window. */ - virtual ~AbstractXWindowContext() = 0; + virtual ~AbstractXApplication() = 0; int exec() override; @@ -77,16 +77,16 @@ class AbstractXWindowContext: public AbstractWindowContext { /** @{ @name Drawing functions */ protected: - /** @copydoc GlutWindowContext::viewportEvent() */ + /** @copydoc GlutApplication::viewportEvent() */ virtual void viewportEvent(const Math::Vector2& size) = 0; - /** @copydoc GlutWindowContext::drawEvent() */ + /** @copydoc GlutApplication::drawEvent() */ virtual void drawEvent() = 0; - /** @copydoc GlutWindowContext::swapBuffers() */ + /** @copydoc GlutApplication::swapBuffers() */ inline void swapBuffers() { contextHandler->swapBuffers(); } - /** @copydoc GlutWindowContext::redraw() */ + /** @copydoc GlutApplication::redraw() */ inline void redraw() { flags |= Flag::Redraw; } /*@}*/ @@ -293,15 +293,15 @@ class AbstractXWindowContext: public AbstractWindowContext { Flags flags; }; -CORRADE_ENUMSET_OPERATORS(AbstractXWindowContext::Modifiers) -CORRADE_ENUMSET_OPERATORS(AbstractXWindowContext::Flags) +CORRADE_ENUMSET_OPERATORS(AbstractXApplication::Modifiers) +CORRADE_ENUMSET_OPERATORS(AbstractXApplication::Flags) /* Implementations for inline functions with unused parameters */ -inline void AbstractXWindowContext::keyPressEvent(Key, Modifiers, const Math::Vector2&) {} -inline void AbstractXWindowContext::keyReleaseEvent(Key, Modifiers, const Math::Vector2&) {} -inline void AbstractXWindowContext::mousePressEvent(MouseButton, Modifiers, const Math::Vector2&) {} -inline void AbstractXWindowContext::mouseReleaseEvent(MouseButton, Modifiers, const Math::Vector2&) {} -inline void AbstractXWindowContext::mouseMotionEvent(Modifiers, const Math::Vector2&) {} +inline void AbstractXApplication::keyPressEvent(Key, Modifiers, const Math::Vector2&) {} +inline void AbstractXApplication::keyReleaseEvent(Key, Modifiers, const Math::Vector2&) {} +inline void AbstractXApplication::mousePressEvent(MouseButton, Modifiers, const Math::Vector2&) {} +inline void AbstractXApplication::mouseReleaseEvent(MouseButton, Modifiers, const Math::Vector2&) {} +inline void AbstractXApplication::mouseMotionEvent(Modifiers, const Math::Vector2&) {} }} diff --git a/src/Platform/CMakeLists.txt b/src/Platform/CMakeLists.txt new file mode 100644 index 000000000..9099367f2 --- /dev/null +++ b/src/Platform/CMakeLists.txt @@ -0,0 +1,93 @@ +# Extension wrangler +add_library(MagnumPlatformExtensionWrangler OBJECT ExtensionWrangler.cpp) + +set(MagnumPlatform_HEADERS + AbstractContextHandler.h + AbstractApplication.h + ExtensionWrangler.h) +install(FILES ${MagnumPlatform_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Platform) + +# GLUT application +if(WITH_GLUTAPPLICATION) + find_package(GLUT) + if(GLUT_FOUND) + add_library(MagnumGlutApplication STATIC + GlutApplication.cpp + $) + install(FILES GlutApplication.h DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Platform) + install(TARGETS MagnumGlutApplication DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}) + else() + message(FATAL_ERROR "GLUT library, required by GlutApplication, was not found. Set WITH_GLUTWINDOWCONTEXT to OFF to skip building it.") + endif() +endif() + +# SDL2 application +if(WITH_SDL2APPLICATION) + find_package(SDL2) + if(SDL2_FOUND) + include_directories(${SDL2_INCLUDE_DIR}) + add_library(MagnumSdl2Application STATIC + Sdl2Application.cpp + $) + install(FILES Sdl2Application.h DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Platform) + install(TARGETS MagnumSdl2Application DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}) + else() + message(FATAL_ERROR "SDL2 library, required by Sdl2Application, was not found. Set WITH_SDL2WINDOWCONTEXT to OFF to skip building it.") + endif() +endif() + +# GLX application +if(WITH_GLXAPPLICATION) + set(NEED_ABSTRACTXAPPLICATION 1) + set(NEED_GLXCONTEXT 1) + add_library(MagnumGlxApplication STATIC + $ + $ + $) + install(FILES GlxApplication.h DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Platform) + install(TARGETS MagnumGlxApplication DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}) +endif() + +# X/EGL window context +if(WITH_XEGLWINDOWCONTEXT) + set(NEED_ABSTRACTXAPPLICATION 1) + set(NEED_EGLCONTEXT 1) + add_library(MagnumXEglApplication STATIC + $ + $ + $) + install(FILES XEglApplication.h DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Platform) + install(TARGETS MagnumXEglApplication DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}) +endif() + +# Abstract X application +if(NEED_ABSTRACTXAPPLICATION) + find_package(X11) + if(NOT X11_FOUND) + message(FATAL_ERROR "X11 library, required by some contexts, was not found. Set WITH_*X*WINDOWCONTEXT to OFF to skip building them.") + endif() + add_library(MagnumAbstractXApplication OBJECT AbstractXApplication.cpp) + # X11 macros are a mess, disable warnings for C-style casts + set_target_properties(MagnumAbstractXApplication PROPERTIES COMPILE_FLAGS "-Wno-old-style-cast") + install(FILES AbstractXApplication.h DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Platform) +endif() + +# GLX context +if(NEED_GLXCONTEXT) + add_library(MagnumGlxContextHandler OBJECT GlxContextHandler.cpp) + # X11 macros are a mess, disable warnings for C-style casts + set_target_properties(MagnumGlxContextHandler PROPERTIES COMPILE_FLAGS "-Wno-old-style-cast") + install(FILES GlxContextHandler.h DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Platform) +endif() + +# EGL context +if(NEED_EGLCONTEXT) + find_package(EGL) + if(NOT EGL_FOUND) + message(FATAL_ERROR "EGL library, required by some window contexts, was not found. Set WITH_*EGL*WINDOWCONTEXT to OFF to skip building them.") + endif() + add_library(MagnumEglContextHandler OBJECT EglContextHandler.cpp) + # X11 macros are a mess, disable warnings for C-style casts + set_target_properties(MagnumEglContextHandler PROPERTIES COMPILE_FLAGS "-Wno-old-style-cast") + install(FILES EglContextHandler.h DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Platform) +endif() diff --git a/src/Contexts/EglContextHandler.cpp b/src/Platform/EglContextHandler.cpp similarity index 98% rename from src/Contexts/EglContextHandler.cpp rename to src/Platform/EglContextHandler.cpp index e237b1714..6f0c9884d 100644 --- a/src/Contexts/EglContextHandler.cpp +++ b/src/Platform/EglContextHandler.cpp @@ -19,7 +19,7 @@ #include "Context.h" -namespace Magnum { namespace Contexts { +namespace Magnum { namespace Platform { EglContextHandler::~EglContextHandler() { eglDestroyContext(display, context); diff --git a/src/Contexts/EglContextHandler.h b/src/Platform/EglContextHandler.h similarity index 88% rename from src/Contexts/EglContextHandler.h rename to src/Platform/EglContextHandler.h index b05c68f69..1198695d0 100644 --- a/src/Contexts/EglContextHandler.h +++ b/src/Platform/EglContextHandler.h @@ -1,5 +1,5 @@ -#ifndef Magnum_Contexts_EglContextHandler_h -#define Magnum_Contexts_EglContextHandler_h +#ifndef Magnum_Platform_EglContextHandler_h +#define Magnum_Platform_EglContextHandler_h /* Copyright © 2010, 2011, 2012 Vladimír Vondruš @@ -16,7 +16,7 @@ */ /** @file - * @brief Class Magnum::Contexts::EglContextHandler + * @brief Class Magnum::Platform::EglContextHandler */ #include "Magnum.h" @@ -33,7 +33,7 @@ #include "magnumCompatibility.h" -namespace Magnum { namespace Contexts { +namespace Magnum { namespace Platform { #ifndef DOXYGEN_GENERATING_OUTPUT /* EGL returns visual ID as int, but Xorg expects long unsigned int */ @@ -45,9 +45,9 @@ typedef EGLInt VisualId; #endif /** -@brief EGL interface +@brief EGL context -Used in XEglWindowContext. +Used in XEglApplication. */ class EglContextHandler: public AbstractContextHandler { public: diff --git a/src/Contexts/ExtensionWrangler.cpp b/src/Platform/ExtensionWrangler.cpp similarity index 96% rename from src/Contexts/ExtensionWrangler.cpp rename to src/Platform/ExtensionWrangler.cpp index 927b66628..c84795546 100644 --- a/src/Contexts/ExtensionWrangler.cpp +++ b/src/Platform/ExtensionWrangler.cpp @@ -19,7 +19,7 @@ #include "Magnum.h" -namespace Magnum { namespace Contexts { +namespace Magnum { namespace Platform { void ExtensionWrangler::initialize(ExperimentalFeatures experimentalFeatures) { #ifndef MAGNUM_TARGET_GLES diff --git a/src/Contexts/ExtensionWrangler.h b/src/Platform/ExtensionWrangler.h similarity index 84% rename from src/Contexts/ExtensionWrangler.h rename to src/Platform/ExtensionWrangler.h index 04dba65d3..f9353b3fc 100644 --- a/src/Contexts/ExtensionWrangler.h +++ b/src/Platform/ExtensionWrangler.h @@ -1,5 +1,5 @@ -#ifndef Magnum_Contexts_ExtensionWrangler_h -#define Magnum_Contexts_ExtensionWrangler_h +#ifndef Magnum_Platform_ExtensionWrangler_h +#define Magnum_Platform_ExtensionWrangler_h /* Copyright © 2010, 2011, 2012 Vladimír Vondruš @@ -16,10 +16,10 @@ */ /** @file - * @brief Class Magnum::Contexts::ExtensionWrangler + * @brief Class Magnum::Platform::ExtensionWrangler */ -namespace Magnum { namespace Contexts { +namespace Magnum { namespace Platform { /** @brief Extension wrangler interface */ class ExtensionWrangler { diff --git a/src/Contexts/GlutWindowContext.cpp b/src/Platform/GlutApplication.cpp similarity index 80% rename from src/Contexts/GlutWindowContext.cpp rename to src/Platform/GlutApplication.cpp index f06f4b38f..321d51c2b 100644 --- a/src/Contexts/GlutWindowContext.cpp +++ b/src/Platform/GlutApplication.cpp @@ -13,16 +13,16 @@ GNU Lesser General Public License version 3 for more details. */ -#include "GlutWindowContext.h" +#include "GlutApplication.h" #include "Context.h" #include "ExtensionWrangler.h" -namespace Magnum { namespace Contexts { +namespace Magnum { namespace Platform { -GlutWindowContext* GlutWindowContext::instance = nullptr; +GlutApplication* GlutApplication::instance = nullptr; -GlutWindowContext::GlutWindowContext(int& argc, char** argv, const std::string& title, const Math::Vector2& size) { +GlutApplication::GlutApplication(int& argc, char** argv, const std::string& title, const Math::Vector2& size) { /* Save global instance */ instance = this; @@ -43,7 +43,7 @@ GlutWindowContext::GlutWindowContext(int& argc, char** argv, const std::string& c = new Context; } -GlutWindowContext::~GlutWindowContext() { +GlutApplication::~GlutApplication() { delete c; } diff --git a/src/Contexts/GlutWindowContext.h b/src/Platform/GlutApplication.h similarity index 90% rename from src/Contexts/GlutWindowContext.h rename to src/Platform/GlutApplication.h index 8cd016cb7..07ae26987 100644 --- a/src/Contexts/GlutWindowContext.h +++ b/src/Platform/GlutApplication.h @@ -1,5 +1,5 @@ -#ifndef Magnum_Contexts_GlutWindowContext_h -#define Magnum_Contexts_GlutWindowContext_h +#ifndef Magnum_Platform_GlutApplication_h +#define Magnum_Platform_GlutApplication_h /* Copyright © 2010, 2011, 2012 Vladimír Vondruš @@ -16,7 +16,7 @@ */ /** @file - * @brief Class Magnum::Contexts::GlutWindowContext + * @brief Class Magnum::Platform::GlutApplication */ #include @@ -26,7 +26,7 @@ #include -#include "AbstractWindowContext.h" +#include "AbstractApplication.h" #include "magnumCompatibility.h" @@ -34,10 +34,10 @@ namespace Magnum { class Context; -namespace Contexts { +namespace Platform { /** @nosubgrouping -@brief GLUT context +@brief GLUT application Supports keyboard handling for limited subset of keys, mouse handling with support for changing cursor and mouse tracking and warping. @@ -45,7 +45,7 @@ support for changing cursor and mouse tracking and warping. You need to implement at least drawEvent() and viewportEvent() to be able to draw on the screen. */ -class GlutWindowContext: public AbstractWindowContext { +class GlutApplication: public AbstractApplication { public: /** * @brief Constructor @@ -56,9 +56,9 @@ class GlutWindowContext: public AbstractWindowContext { * * Creates double-buffered RGBA window with depth and stencil buffers. */ - GlutWindowContext(int& argc, char** argv, const std::string& title = "Magnum GLUT window context", const Math::Vector2& size = Math::Vector2(800, 600)); + GlutApplication(int& argc, char** argv, const std::string& title = "Magnum GLUT application", const Math::Vector2& size = Math::Vector2(800, 600)); - ~GlutWindowContext(); + ~GlutApplication(); inline int exec() override { glutMainLoop(); @@ -250,16 +250,16 @@ class GlutWindowContext: public AbstractWindowContext { instance->drawEvent(); } - static GlutWindowContext* instance; + static GlutApplication* instance; Context* c; }; /* Implementations for inline functions with unused parameters */ -inline void GlutWindowContext::keyPressEvent(Key, const Math::Vector2&) {} -inline void GlutWindowContext::mousePressEvent(MouseButton, const Math::Vector2&) {} -inline void GlutWindowContext::mouseReleaseEvent(MouseButton, const Math::Vector2&) {} -inline void GlutWindowContext::mouseMotionEvent(const Math::Vector2&) {} +inline void GlutApplication::keyPressEvent(Key, const Math::Vector2&) {} +inline void GlutApplication::mousePressEvent(MouseButton, const Math::Vector2&) {} +inline void GlutApplication::mouseReleaseEvent(MouseButton, const Math::Vector2&) {} +inline void GlutApplication::mouseMotionEvent(const Math::Vector2&) {} }} diff --git a/src/Contexts/GlxWindowContext.h b/src/Platform/GlxApplication.h similarity index 66% rename from src/Contexts/GlxWindowContext.h rename to src/Platform/GlxApplication.h index f69f6f7d7..90b15ad44 100644 --- a/src/Contexts/GlxWindowContext.h +++ b/src/Platform/GlxApplication.h @@ -1,5 +1,5 @@ -#ifndef Magnum_Contexts_GlxWindowContext_h -#define Magnum_Contexts_GlxWindowContext_h +#ifndef Magnum_Platform_GlxApplication_h +#define Magnum_Platform_GlxApplication_h /* Copyright © 2010, 2011, 2012 Vladimír Vondruš @@ -16,20 +16,20 @@ */ /** @file - * @brief Class Magnum::Contexts::GlxWindowContext + * @brief Class Magnum::Platform::GlxApplication */ -#include "AbstractXWindowContext.h" +#include "AbstractXApplication.h" #include "GlxContextHandler.h" -namespace Magnum { namespace Contexts { +namespace Magnum { namespace Platform { /** -@brief GLX context +@brief GLX application Uses GlxContextHandler. */ -class GlxWindowContext: public AbstractXWindowContext { +class GlxApplication: public AbstractXApplication { public: /** * @brief Constructor @@ -41,7 +41,7 @@ class GlxWindowContext: public AbstractXWindowContext { * Creates window with double-buffered OpenGL 3.2 core context or * OpenGL ES 2.0 context, if targetting OpenGL ES. */ - inline GlxWindowContext(int& argc, char** argv, const std::string& title = "Magnum GLX window context", const Math::Vector2& size = Math::Vector2(800, 600)): AbstractXWindowContext(new GlxContextHandler, argc, argv, title, size) {} + inline GlxApplication(int& argc, char** argv, const std::string& title = "Magnum GLX application", const Math::Vector2& size = Math::Vector2(800, 600)): AbstractXApplication(new GlxContextHandler, argc, argv, title, size) {} }; }} diff --git a/src/Contexts/GlxContextHandler.cpp b/src/Platform/GlxContextHandler.cpp similarity index 98% rename from src/Contexts/GlxContextHandler.cpp rename to src/Platform/GlxContextHandler.cpp index ebc478b6c..cc6ab5698 100644 --- a/src/Contexts/GlxContextHandler.cpp +++ b/src/Platform/GlxContextHandler.cpp @@ -22,7 +22,7 @@ #define None 0L // redef Xlib nonsense -namespace Magnum { namespace Contexts { +namespace Magnum { namespace Platform { VisualID GlxContextHandler::getVisualId(Display* nativeDisplay) { display = nativeDisplay; diff --git a/src/Contexts/GlxContextHandler.h b/src/Platform/GlxContextHandler.h similarity index 88% rename from src/Contexts/GlxContextHandler.h rename to src/Platform/GlxContextHandler.h index 32ba4a81f..e59eb8083 100644 --- a/src/Contexts/GlxContextHandler.h +++ b/src/Platform/GlxContextHandler.h @@ -1,5 +1,5 @@ -#ifndef Magnum_Contexts_GlxContextHandler_h -#define Magnum_Contexts_GlxContextHandler_h +#ifndef Magnum_Platform_GlxContextHandler_h +#define Magnum_Platform_GlxContextHandler_h /* Copyright © 2010, 2011, 2012 Vladimír Vondruš @@ -16,7 +16,7 @@ */ /** @file - * @brief Class Magnum::Contexts::GlxContextHandler + * @brief Class Magnum::Platform::GlxContextHandler */ #include "Magnum.h" @@ -29,15 +29,15 @@ #include "magnumCompatibility.h" -namespace Magnum { namespace Contexts { +namespace Magnum { namespace Platform { /** -@brief GLX interface +@brief GLX context Creates OpenGL 3.2 core context or OpenGL ES 2.0 context, if targetting OpenGL ES. -Used in GlxWindowContext. +Used in GlxApplication. */ class GlxContextHandler: public AbstractContextHandler { public: diff --git a/src/Contexts/Sdl2WindowContext.cpp b/src/Platform/Sdl2Application.cpp similarity index 93% rename from src/Contexts/Sdl2WindowContext.cpp rename to src/Platform/Sdl2Application.cpp index f87e33b06..00dfaee4d 100644 --- a/src/Contexts/Sdl2WindowContext.cpp +++ b/src/Platform/Sdl2Application.cpp @@ -13,14 +13,14 @@ GNU Lesser General Public License version 3 for more details. */ -#include "Sdl2WindowContext.h" +#include "Sdl2Application.h" #include "Context.h" #include "ExtensionWrangler.h" -namespace Magnum { namespace Contexts { +namespace Magnum { namespace Platform { -Sdl2WindowContext::Sdl2WindowContext(int, char**, const std::string& name, const Math::Vector2& size): _redraw(true) { +Sdl2Application::Sdl2Application(int, char**, const std::string& name, const Math::Vector2& size): _redraw(true) { if(SDL_Init(SDL_INIT_VIDEO) < 0) { Error() << "Cannot initialize SDL."; exit(1); @@ -58,7 +58,7 @@ Sdl2WindowContext::Sdl2WindowContext(int, char**, const std::string& name, const c = new Context; } -Sdl2WindowContext::~Sdl2WindowContext() { +Sdl2Application::~Sdl2Application() { delete c; SDL_GL_DeleteContext(context); @@ -66,7 +66,7 @@ Sdl2WindowContext::~Sdl2WindowContext() { SDL_Quit(); } -int Sdl2WindowContext::exec() { +int Sdl2Application::exec() { for(;;) { SDL_Event event; diff --git a/src/Contexts/Sdl2WindowContext.h b/src/Platform/Sdl2Application.h similarity index 83% rename from src/Contexts/Sdl2WindowContext.h rename to src/Platform/Sdl2Application.h index 1a215a2b7..0ce360313 100644 --- a/src/Contexts/Sdl2WindowContext.h +++ b/src/Platform/Sdl2Application.h @@ -1,5 +1,5 @@ -#ifndef Magnum_Contexts_Sdl2WindowContext_h -#define Magnum_Contexts_Sdl2WindowContext_h +#ifndef Magnum_Platform_Sdl2Application_h +#define Magnum_Platform_Sdl2Application_h /* Copyright © 2010, 2011, 2012 Vladimír Vondruš @@ -16,7 +16,7 @@ */ /** @file - * @brief Class Magnum::Contexts::Sdl2WindowContext + * @brief Class Magnum::Platform::Sdl2Application */ #include "Math/Vector2.h" @@ -26,7 +26,7 @@ #include #include -#include "AbstractWindowContext.h" +#include "AbstractApplication.h" #include "magnumCompatibility.h" @@ -34,17 +34,17 @@ namespace Magnum { class Context; -namespace Contexts { +namespace Platform { /** @nosubgrouping -@brief SDL2 context +@brief SDL2 application Supports keyboard and mouse handling. You need to implement at least drawEvent() and viewportEvent() to be able to draw on the screen. */ -class Sdl2WindowContext: public AbstractWindowContext { +class Sdl2Application: public AbstractApplication { public: /** * @brief Constructor @@ -56,30 +56,30 @@ class Sdl2WindowContext: public AbstractWindowContext { * Creates centered non-resizable window with double-buffered * OpenGL 3.2 context with 24bit depth buffer. */ - Sdl2WindowContext(int argc, char** argv, const std::string& title = "Magnum SDL2 window context", const Math::Vector2& size = Math::Vector2(800, 600)); + Sdl2Application(int argc, char** argv, const std::string& title = "Magnum SDL2 application", const Math::Vector2& size = Math::Vector2(800, 600)); /** * @brief Destructor * * Deletes context and destroys the window. */ - ~Sdl2WindowContext(); + ~Sdl2Application(); int exec() override; /** @{ @name Drawing functions */ protected: - /** @copydoc GlutWindowContext::viewportEvent() */ + /** @copydoc GlutApplication::viewportEvent() */ virtual void viewportEvent(const Math::Vector2& size) = 0; - /** @copydoc GlutWindowContext::drawEvent() */ + /** @copydoc GlutApplication::drawEvent() */ virtual void drawEvent() = 0; - /** @copydoc GlutWindowContext::swapBuffers() */ + /** @copydoc GlutApplication::swapBuffers() */ inline void swapBuffers() { SDL_GL_SwapWindow(window); } - /** @copydoc GlutWindowContext::redraw() */ + /** @copydoc GlutApplication::redraw() */ inline void redraw() { _redraw = true; } /*@}*/ @@ -203,14 +203,14 @@ class Sdl2WindowContext: public AbstractWindowContext { bool _redraw; }; -CORRADE_ENUMSET_OPERATORS(Sdl2WindowContext::Modifiers) +CORRADE_ENUMSET_OPERATORS(Sdl2Application::Modifiers) /* Implementations for inline functions with unused parameters */ -inline void Sdl2WindowContext::keyPressEvent(Key, Modifiers, const Math::Vector2&) {} -inline void Sdl2WindowContext::keyReleaseEvent(Key, Modifiers, const Math::Vector2&) {} -inline void Sdl2WindowContext::mousePressEvent(MouseButton, Modifiers, const Math::Vector2&) {} -inline void Sdl2WindowContext::mouseReleaseEvent(MouseButton, Modifiers, const Math::Vector2&) {} -inline void Sdl2WindowContext::mouseMotionEvent(Modifiers, const Math::Vector2&) {} +inline void Sdl2Application::keyPressEvent(Key, Modifiers, const Math::Vector2&) {} +inline void Sdl2Application::keyReleaseEvent(Key, Modifiers, const Math::Vector2&) {} +inline void Sdl2Application::mousePressEvent(MouseButton, Modifiers, const Math::Vector2&) {} +inline void Sdl2Application::mouseReleaseEvent(MouseButton, Modifiers, const Math::Vector2&) {} +inline void Sdl2Application::mouseMotionEvent(Modifiers, const Math::Vector2&) {} }} diff --git a/src/Contexts/XEglWindowContext.h b/src/Platform/XEglApplication.h similarity index 64% rename from src/Contexts/XEglWindowContext.h rename to src/Platform/XEglApplication.h index 94f0ac034..0478b0921 100644 --- a/src/Contexts/XEglWindowContext.h +++ b/src/Platform/XEglApplication.h @@ -1,5 +1,5 @@ -#ifndef Magnum_Contexts_XEglWindowContext_h -#define Magnum_Contexts_XEglWindowContext_h +#ifndef Magnum_Platform_XEglApplication_h +#define Magnum_Platform_XEglApplication_h /* Copyright © 2010, 2011, 2012 Vladimír Vondruš @@ -16,20 +16,20 @@ */ /** @file - * @brief Class Magnum::Contexts::XEglWindowContext + * @brief Class Magnum::Platform::XEglApplication */ -#include "AbstractXWindowContext.h" +#include "AbstractXApplication.h" #include "EglContextHandler.h" -namespace Magnum { namespace Contexts { +namespace Magnum { namespace Platform { /** -@brief X/EGL context +@brief X/EGL application Uses EglContextHandler. */ -class XEglWindowContext: public AbstractXWindowContext { +class XEglApplication: public AbstractXApplication { public: /** * @brief Constructor @@ -40,7 +40,7 @@ class XEglWindowContext: public AbstractXWindowContext { * * Creates window with double-buffered OpenGL ES 2 context. */ - inline XEglWindowContext(int& argc, char** argv, const std::string& title = "Magnum X/EGL window context", const Math::Vector2& size = Math::Vector2(800, 600)): AbstractXWindowContext(new EglContextHandler, argc, argv, title, size) {} + inline XEglApplication(int& argc, char** argv, const std::string& title = "Magnum X/EGL application", const Math::Vector2& size = Math::Vector2(800, 600)): AbstractXApplication(new EglContextHandler, argc, argv, title, size) {} }; }} diff --git a/src/Profiler.h b/src/Profiler.h index 3be943bd6..d17ef663b 100644 --- a/src/Profiler.h +++ b/src/Profiler.h @@ -32,7 +32,7 @@ namespace Magnum { @brief Measuring elapsed time in each frame Measures time passed during specified sections of each frame. It's meant to be -used in rendering and event loops (e.g. Contexts::GlutContext::drawEvent()), +used in rendering and event loops (e.g. Platform::GlutApplication::drawEvent()), but it's possible to use it standalone elsewhere. Example usage: @code Profiler p; From 9cf48eee56a15674dc396882818db500d4dab850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 10 Nov 2012 22:44:42 +0100 Subject: [PATCH 15/18] Platform: removed unneeded AbstractApplication base. It's really not needed to have useless class defining only one function (which wouldn't be used everywhere anyway). --- src/Platform/AbstractApplication.h | 52 ----------------------------- src/Platform/AbstractXApplication.h | 9 +++-- src/Platform/CMakeLists.txt | 1 - src/Platform/GlutApplication.h | 26 +++++++++++---- src/Platform/GlxApplication.h | 15 +++++++++ src/Platform/Sdl2Application.h | 26 +++++++++++---- src/Platform/XEglApplication.h | 15 +++++++++ 7 files changed, 76 insertions(+), 68 deletions(-) delete mode 100644 src/Platform/AbstractApplication.h diff --git a/src/Platform/AbstractApplication.h b/src/Platform/AbstractApplication.h deleted file mode 100644 index 5a5025818..000000000 --- a/src/Platform/AbstractApplication.h +++ /dev/null @@ -1,52 +0,0 @@ -#ifndef Magnum_Platform_AbstractApplication_h -#define Magnum_Platform_AbstractApplication_h -/* - Copyright © 2010, 2011, 2012 Vladimír Vondruš - - This file is part of Magnum. - - Magnum is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License version 3 - only, as published by the Free Software Foundation. - - Magnum is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License version 3 for more details. -*/ - -/** @file - * @brief Class Magnum::Platform::AbstractApplication - */ - -namespace Magnum { namespace Platform { - -/** -@brief Base class for applications - -See subclasses documentation for more information. Subclasses are meant to be -used directly in `main()`, for example: -@code -class MyContext: public Magnum::Platform::GlutApplication { - // implement required methods... -}; -int main(int argc, char** argv) { - MyContext c(argc, argv); - return c.exec(); -} -@endcode -*/ -class AbstractApplication { - public: - virtual inline ~AbstractApplication() {} - - /** - * @brief Execute main loop - * @return Value for returning from `main()`. - */ - virtual int exec() = 0; -}; - -}} - -#endif diff --git a/src/Platform/AbstractXApplication.h b/src/Platform/AbstractXApplication.h index d6531c119..0cc4c3e3e 100644 --- a/src/Platform/AbstractXApplication.h +++ b/src/Platform/AbstractXApplication.h @@ -30,7 +30,6 @@ #undef Always #include "Math/Vector2.h" -#include "AbstractApplication.h" #include "AbstractContextHandler.h" #include "magnumCompatibility.h" @@ -48,7 +47,7 @@ Supports keyboard and mouse handling. @note Not meant to be used directly, see subclasses. */ -class AbstractXApplication: public AbstractApplication { +class AbstractXApplication { public: /** * @brief Constructor @@ -69,7 +68,11 @@ class AbstractXApplication: public AbstractApplication { */ virtual ~AbstractXApplication() = 0; - int exec() override; + /** + * @brief Execute main loop + * @return Value for returning from `main()`. + */ + int exec(); /** @brief Exit application main loop */ inline void exit() { flags |= Flag::Exit; } diff --git a/src/Platform/CMakeLists.txt b/src/Platform/CMakeLists.txt index 9099367f2..abfa827a6 100644 --- a/src/Platform/CMakeLists.txt +++ b/src/Platform/CMakeLists.txt @@ -3,7 +3,6 @@ add_library(MagnumPlatformExtensionWrangler OBJECT ExtensionWrangler.cpp) set(MagnumPlatform_HEADERS AbstractContextHandler.h - AbstractApplication.h ExtensionWrangler.h) install(FILES ${MagnumPlatform_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Platform) diff --git a/src/Platform/GlutApplication.h b/src/Platform/GlutApplication.h index 07ae26987..aa30a55f3 100644 --- a/src/Platform/GlutApplication.h +++ b/src/Platform/GlutApplication.h @@ -26,8 +26,6 @@ #include -#include "AbstractApplication.h" - #include "magnumCompatibility.h" namespace Magnum { @@ -42,10 +40,22 @@ namespace Platform { Supports keyboard handling for limited subset of keys, mouse handling with support for changing cursor and mouse tracking and warping. +@section GlutApplication-usage Usage + You need to implement at least drawEvent() and viewportEvent() to be able to -draw on the screen. +draw on the screen. The subclass can be then used directly in `main()`, for +example: +@code +class MyApplication: public Magnum::Platform::GlutApplication { + // implement required methods... +}; +int main(int argc, char** argv) { + MyApplication c(argc, argv); + return c.exec(); +} +@endcode */ -class GlutApplication: public AbstractApplication { +class GlutApplication { public: /** * @brief Constructor @@ -58,9 +68,13 @@ class GlutApplication: public AbstractApplication { */ GlutApplication(int& argc, char** argv, const std::string& title = "Magnum GLUT application", const Math::Vector2& size = Math::Vector2(800, 600)); - ~GlutApplication(); + virtual ~GlutApplication(); - inline int exec() override { + /** + * @brief Execute main loop + * @return Value for returning from `main()`. + */ + inline int exec() { glutMainLoop(); return 0; } diff --git a/src/Platform/GlxApplication.h b/src/Platform/GlxApplication.h index 90b15ad44..95535cce0 100644 --- a/src/Platform/GlxApplication.h +++ b/src/Platform/GlxApplication.h @@ -28,6 +28,21 @@ namespace Magnum { namespace Platform { @brief GLX application Uses GlxContextHandler. + +@section GlxApplication-usage Usage + +You need to implement at least drawEvent() and viewportEvent() to be able to +draw on the screen. The subclass can be then used directly in `main()`, for +example: +@code +class MyApplication: public Magnum::Platform::GlxApplication { + // implement required methods... +}; +int main(int argc, char** argv) { + MyApplication c(argc, argv); + return c.exec(); +} +@endcode */ class GlxApplication: public AbstractXApplication { public: diff --git a/src/Platform/Sdl2Application.h b/src/Platform/Sdl2Application.h index 0ce360313..033fc804f 100644 --- a/src/Platform/Sdl2Application.h +++ b/src/Platform/Sdl2Application.h @@ -26,8 +26,6 @@ #include #include -#include "AbstractApplication.h" - #include "magnumCompatibility.h" namespace Magnum { @@ -41,10 +39,22 @@ namespace Platform { Supports keyboard and mouse handling. +@section Sdl2Application-usage Usage + You need to implement at least drawEvent() and viewportEvent() to be able to -draw on the screen. +draw on the screen. The subclass can be then used directly in `main()`, for +example: +@code +class MyApplication: public Magnum::Platform::Sdl2Application { + // implement required methods... +}; +int main(int argc, char** argv) { + MyApplication c(argc, argv); + return c.exec(); +} +@endcode */ -class Sdl2Application: public AbstractApplication { +class Sdl2Application { public: /** * @brief Constructor @@ -63,9 +73,13 @@ class Sdl2Application: public AbstractApplication { * * Deletes context and destroys the window. */ - ~Sdl2Application(); + virtual ~Sdl2Application(); - int exec() override; + /** + * @brief Execute main loop + * @return Value for returning from `main()`. + */ + int exec(); /** @{ @name Drawing functions */ diff --git a/src/Platform/XEglApplication.h b/src/Platform/XEglApplication.h index 0478b0921..490b16353 100644 --- a/src/Platform/XEglApplication.h +++ b/src/Platform/XEglApplication.h @@ -28,6 +28,21 @@ namespace Magnum { namespace Platform { @brief X/EGL application Uses EglContextHandler. + +@section XEglApplication-usage Usage + +You need to implement at least drawEvent() and viewportEvent() to be able to +draw on the screen. The subclass can be then used directly in `main()`, for +example: +@code +class MyApplication: public Magnum::Platform::XEglApplication { + // implement required methods... +}; +int main(int argc, char** argv) { + MyApplication c(argc, argv); + return c.exec(); +} +@endcode */ class XEglApplication: public AbstractXApplication { public: From 15f27148b703668ba9c9b8d7816a5404c4e5ed9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 10 Nov 2012 22:45:59 +0100 Subject: [PATCH 16/18] Doc: building updates and fixes. --- README.md | 8 +++----- doc/building.dox | 11 +++++------ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 3eb2cc4fa..067288410 100644 --- a/README.md +++ b/README.md @@ -36,9 +36,7 @@ Minimal dependencies which are tested to support everything needed: **GCC** >= 4.6 and **Clang** >= 3.1. * **CMake** >= 2.8.8 (needed for `OBJECT` library target) - * **OpenGL** headers, on Linux most probably shipped with Mesa or - **OpenGL ES 2** headers, if targeting OpenGL ES. - * **GLEW** - OpenGL extension wrangler + * **GLEW** - OpenGL extension wrangler (only if targeting desktop OpenGL) * **Corrade** - Plugin management and utility library. You can get it at http://github.com/mosra/corrade or at http://mosra.cz/blog/corrade.php. @@ -59,8 +57,8 @@ Building and running unit tests ------------------------------- If you want to build also unit tests (which are not built by default), pass -`-DBUILD_TESTS=True` to CMake. Unit tests use Corrade's TestSuite framework -and can be run using +`-DBUILD_TESTS=ON` to CMake. Unit tests use Corrade's TestSuite framework and +can be run using ctest --output-on-failure diff --git a/doc/building.dox b/doc/building.dox index 52a1c25ad..c4a964b79 100644 --- a/doc/building.dox +++ b/doc/building.dox @@ -15,9 +15,7 @@ Minimal set of tools and libraries required for building is: which are tested to support everything needed: **GCC** >= 4.6 and **Clang** >= 3.1. - **CMake** >= 2.8.8 (needed for `OBJECT` library target) -- **OpenGL** headers, on Linux most probably shipped with Mesa, or - **OpenGL ES 2** headers, if targeting OpenGL ES (see below). -- **GLEW** - OpenGL extension wrangler +- **GLEW** - OpenGL extension wrangler (only if targeting desktop OpenGL) - **Corrade** - Plugin management and utility library. You can get it at http://github.com/mosra/corrade or at http://mosra.cz/blog/corrade.php. @@ -66,6 +64,7 @@ specify which parts will be built and which not: - `WITH_MESHTOOLS` - MeshTools library. - `WITH_PHYSICS` - Physics library. - `WITH_PRIMITIVES` - Primitives library. + - `WITH_SCENEGRAPH` - SceneGraph library. - `WITH_SHADERS` - Shaders library. None of the application libraries is built by default, regardless to @@ -81,7 +80,7 @@ None of the application libraries is built by default, regardless to @subsection building-tests Building and running unit tests If you want to build also unit tests (which are not built by default), pass -`-DBUILD_TESTS=True` to CMake. Unit tests use Corrade's @ref Corrade::TestSuite +`-DBUILD_TESTS=ON` to CMake. Unit tests use Corrade's @ref Corrade::TestSuite "TestSuite" framework and can be run using ctest --output-on-failure @@ -122,8 +121,8 @@ unsupported CXX flags. this system there is also prepared `mingw32-magnum` development package in root, named `PKGBUILD-mingw32`. -You will need MinGW32 versions of the compiler and all libraries (OpenGL -headers, GLEW, Corrade), i.e. these ArchLinux packages: +You will need MinGW32 versions of the compiler and all libraries (GLEW, +Corrade), i.e. these ArchLinux packages: - `mingw32-gcc`, which depends on `mingw32-w32api` containing OpenGL headers - `mingw32-runtime` From 643977abbd9de49e5cd5058c9067169fff3fe6a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 10 Nov 2012 22:57:15 +0100 Subject: [PATCH 17/18] Platform: support for NaCl applications. --- CMakeLists.txt | 4 +- modules/FindMagnum.cmake | 4 + src/Platform/CMakeLists.txt | 12 +++ src/Platform/NaClApplication.cpp | 97 +++++++++++++++++ src/Platform/NaClApplication.h | 175 +++++++++++++++++++++++++++++++ 5 files changed, 291 insertions(+), 1 deletion(-) create mode 100644 src/Platform/NaClApplication.cpp create mode 100644 src/Platform/NaClApplication.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 17a27416c..4fd72c8ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,9 @@ option(WITH_GLXAPPLICATION "Build GlxApplication library" OFF) cmake_dependent_option(WITH_XEGLAPPLICATION "Build XEglApplication library" OFF "TARGET_GLES" OFF) cmake_dependent_option(WITH_GLUTAPPLICATION "Build GlutApplication library" OFF "NOT TARGET_GLES" OFF) option(WITH_SDL2APPLICATION "Build Sdl2Application library" OFF) - +if(${CMAKE_SYSTEM_NAME} STREQUAL NaCl) + option(WITH_NACLAPPLICATION "Build NaClApplication library" OFF) +endif() option(BUILD_TESTS "Build unit tests." OFF) if(BUILD_TESTS) diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake index d325250f6..c6b4fce29 100644 --- a/modules/FindMagnum.cmake +++ b/modules/FindMagnum.cmake @@ -25,6 +25,8 @@ # XEglApplication - X/EGL application (depends on EGL and X11 libraries) # GlutApplication - GLUT application (depends on GLUT library) # Sdl2Application - SDL2 application (depends on SDL2 library) +# NaClApplication - NaCl application (only if targetting Google Chrome +# Native Client) # Example usage with specifying additional components is: # find_package(Magnum [REQUIRED|COMPONENTS] # MeshTools Primitives GlutApplication) @@ -134,6 +136,8 @@ foreach(component ${Magnum_FIND_COMPONENTS}) endif() endif() + # NaCl application has no additional dependencies + # GLX application dependencies if(${component} STREQUAL GlxApplication) find_package(X11) diff --git a/src/Platform/CMakeLists.txt b/src/Platform/CMakeLists.txt index abfa827a6..f441d40be 100644 --- a/src/Platform/CMakeLists.txt +++ b/src/Platform/CMakeLists.txt @@ -35,6 +35,18 @@ if(WITH_SDL2APPLICATION) endif() endif() +# NaCl application +if(WITH_NACLAPPLICATION) + if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL NaCl) + message(FATAL_ERROR "NaClApplication is available only when targetting Google Chrome Native Client. Set WITH_NACLAPPLICATION to OFF to skip building it.") + endif() + + add_library(MagnumNaClApplication STATIC + NaClApplication.cpp) + install(FILES NaClApplication.h DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Platform) + install(TARGETS MagnumNaClApplication DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}) +endif() + # GLX application if(WITH_GLXAPPLICATION) set(NEED_ABSTRACTXAPPLICATION 1) diff --git a/src/Platform/NaClApplication.cpp b/src/Platform/NaClApplication.cpp new file mode 100644 index 000000000..401233f9d --- /dev/null +++ b/src/Platform/NaClApplication.cpp @@ -0,0 +1,97 @@ +/* + Copyright © 2010, 2011, 2012 Vladimír Vondruš + + This file is part of Magnum. + + Magnum is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License version 3 + only, as published by the Free Software Foundation. + + Magnum is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License version 3 for more details. +*/ + +#include "NaClApplication.h" + +#include +#include +#include + +#include "Context.h" + +namespace Magnum { namespace Platform { + +NaClApplication::NaClApplication(PP_Instance instance, const Math::Vector2& size): Instance(instance), Graphics3DClient(this), viewportSize(size) { + int32_t attributes[] = { + PP_GRAPHICS3DATTRIB_ALPHA_SIZE, 8, + PP_GRAPHICS3DATTRIB_DEPTH_SIZE, 24, + PP_GRAPHICS3DATTRIB_STENCIL_SIZE, 8, + PP_GRAPHICS3DATTRIB_SAMPLES, 0, + PP_GRAPHICS3DATTRIB_SAMPLE_BUFFERS, 0, + PP_GRAPHICS3DATTRIB_WIDTH, size.x(), + PP_GRAPHICS3DATTRIB_HEIGHT, size.y(), + PP_GRAPHICS3DATTRIB_NONE + }; + + graphics = new pp::Graphics3D(this, attributes); + if(graphics->is_null()) { + Error() << "Platform::NaClApplication::NaClApplication(): cannot create graphics"; + exit(1); + } + if(!BindGraphics(*graphics)) { + Error() << "Platform::NaClApplication::NaClApplication(): cannot bind graphics"; + exit(1); + } + + glSetCurrentContextPPAPI(graphics->pp_resource()); + + c = new Context; +} + +NaClApplication::~NaClApplication() { + delete c; + delete graphics; +} + +void NaClApplication::DidChangeView(const pp::View& view) { + Math::Vector2 size(view.GetRect().width(), view.GetRect().height()); + + /* Canvas resized */ + if(viewportSize != size) { + graphics->ResizeBuffers(size.x(), size.y()); + viewportSize = size; + flags |= Flag::ViewportUpdated; + } + + /* Update viewport, if changed */ + if(!(flags & Flag::ViewportUpdated)) { + flags &= ~Flag::ViewportUpdated; + viewportEvent(size); + } + + drawEvent(); +} + +void NaClApplication::swapBuffers() { + /* Swap already in progress, do nothing */ + if(flags & Flag::SwapInProgress) return; + + /* Swap buffers and call swapCallback() when done */ + flags |= Flag::SwapInProgress; + graphics->SwapBuffers(pp::CompletionCallback(&swapCallback, this)); +} + +void NaClApplication::swapCallback(void* applicationInstance, std::int32_t) { + NaClApplication* instance = static_cast(applicationInstance); + instance->flags &= ~Flag::SwapInProgress; + + /* Redraw, if requested */ + if(instance->flags & Flag::Redraw) { + instance->flags &= ~Flag::Redraw; + instance->drawEvent(); + } +} + +}} diff --git a/src/Platform/NaClApplication.h b/src/Platform/NaClApplication.h new file mode 100644 index 000000000..bb0ecd3e0 --- /dev/null +++ b/src/Platform/NaClApplication.h @@ -0,0 +1,175 @@ +#ifndef Magnum_Platform_NaClApplication_h +#define Magnum_Platform_NaClApplication_h +/* + Copyright © 2010, 2011, 2012 Vladimír Vondruš + + This file is part of Magnum. + + Magnum is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License version 3 + only, as published by the Free Software Foundation. + + Magnum is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License version 3 for more details. +*/ + +/** @file + * @brief Class Magnum::Platform::NaClApplication + */ + +#include +#include +#include +#include +#include +#include +#include + +#include "Math/Vector2.h" +#include "Magnum.h" + +#include "magnumCompatibility.h" + +namespace pp { + class Graphics3D; +} + +namespace Magnum { + +class Context; + +namespace Platform { + +/** @nosubgrouping +@brief NaCl application + +@section NaClApplication-usage Usage + +You need to implement at least drawEvent() and viewportEvent() to be able to +draw on the screen. The subclass must be then registered to NaCl API using +MAGNUM_NACLAPPLICATION_MAIN() macro. +@code +class MyApplication: public Magnum::Platform::Sdl2Application { + // implement required methods... +}; +MAGNUM_NACLAPPLICATION_MAIN(MyApplication) +@endcode +*/ +class NaClApplication: public pp::Instance, public pp::Graphics3DClient { + public: + /** + * @brief Constructor + * @param instance Module instance + * @param size Rendering size + * + * Creates double-buffered RGBA canvas with depth and stencil buffers. + */ + explicit NaClApplication(PP_Instance instance, const Math::Vector2& size = Math::Vector2(640, 480)); + + ~NaClApplication(); + + /** @{ @name Drawing functions */ + + protected: + /** + * @brief Viewport event + * + * Called when viewport size changes. You should pass the new size to + * Framebuffer::setViewport() or SceneGraph::Camera::setViewport(), + * if using scene graph. + */ + virtual void viewportEvent(const Math::Vector2& size) = 0; + + /** + * @brief Draw event + * + * Here implement your drawing functions, such as calling + * SceneGraph::Camera::draw(). After drawing is finished, call + * swapBuffers(). If you want to draw immediately again, call also + * redraw(). + */ + virtual void drawEvent() = 0; + + /** + * @brief Swap buffers + * + * Paints currently rendered framebuffer on screen. + */ + void swapBuffers(); + + /** + * @brief Redraw immediately + * + * Marks the window for redrawing, resulting in call of drawEvent() + * in the next iteration. + */ + inline void redraw() { + flags |= Flag::Redraw; + } + + /*@}*/ + + private: + enum class Flag: std::uint8_t { + ViewportUpdated = 1 << 0, + SwapInProgress = 1 << 1, + Redraw = 1 << 2 + }; + typedef Corrade::Containers::EnumSet Flags; + + inline void Graphics3DContextLost() override { + CORRADE_ASSERT(false, "NaClApplication: context unexpectedly lost", ); + } + + void DidChangeView(const pp::View& view) override; + + static void swapCallback(void* applicationInstance, std::int32_t); + + pp::Graphics3D* graphics; + Context* c; + Math::Vector2 viewportSize; + Flags flags; + + CORRADE_ENUMSET_FRIEND_OPERATORS(Flags) +}; + +CORRADE_ENUMSET_OPERATORS(NaClApplication::Flags) + +#ifndef DOXYGEN_GENERATING_OUTPUT +namespace Implementation { + template class NaClModule: public pp::Module { + public: + inline ~NaClModule() { + glTerminatePPAPI(); + } + + inline bool Init() override { + return glInitializePPAPI(get_browser_interface()) == GL_TRUE; + } + + inline pp::Instance* CreateInstance(PP_Instance instance) { + return new Application(instance); + } + }; +} +#endif + +/** @hideinitializer +@brief Entry point for NaCl application +@param application Application class name + +See NaClApplication for more information. +*/ +/* look at that insane placement of __attribute__. WTF. */ +#define MAGNUM_NACLAPPLICATION_MAIN(application) \ + namespace pp { \ + Module __attribute__ ((visibility ("default"))) * CreateModule() { \ + return new Magnum::Platform::Implementation::NaClModule(); \ + } \ + } + +}} + +#endif From 3308bcaa22503698f9854b958bb5a900c9df02a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 10 Nov 2012 23:02:25 +0100 Subject: [PATCH 18/18] Added PKGBUILD for easy NaCl builds. --- PKGBUILD-nacl | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 PKGBUILD-nacl diff --git a/PKGBUILD-nacl b/PKGBUILD-nacl new file mode 100644 index 000000000..5f806d805 --- /dev/null +++ b/PKGBUILD-nacl @@ -0,0 +1,29 @@ +# Author: mosra +pkgname=nacl-magnum +pkgver=dev +pkgrel=1 +pkgdesc="OpenGL 3 graphics engine (NaCl x86-64 version)" +arch=('x86_64') +url="https://github.com/mosra/magnum" +license=('LGPLv3') +depends=('nacl-corrade') +makedepends=('nacl-sdk' 'cmake') +options=(!makeflags !buildflags !strip) + +build() { + mkdir -p "$startdir/build-nacl-x86-64" + cd "$startdir/build-nacl-x86-64" + + cmake .. \ + -DCMAKE_MODULE_PATH="$startdir/toolchains/modules" \ + -DCMAKE_TOOLCHAIN_FILE="$startdir/toolchains/generic/NaCl-glibc-x86-64.cmake" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr/nacl \ + -DWITH_NACLAPPLICATION=ON + make +} + +package() { + cd "$startdir/build-nacl-x86-64" + make DESTDIR="$pkgdir/" install +}