Replaced GLEW with (a highly customized) loader generated by glLoadGen, restructured GLExtensions.hpp for easier extension bookkeeping, make use of GLEXT definitions in Shader.cpp and Texture.cpp as well, replaced GL_MAX_TEXTURE_COORDS with GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, implemented flags for requesting a debug or core/compatibility profile context, changed the default context version from 2.0 to 2.1.
This commit is contained in:
parent
ea2bf65186
commit
3e397bff4b
34 changed files with 3067 additions and 30523 deletions
|
@ -35,6 +35,17 @@ namespace sf
|
|||
////////////////////////////////////////////////////////////
|
||||
struct ContextSettings
|
||||
{
|
||||
////////////////////////////////////////////////////////////
|
||||
/// \brief Enumeration of the context attribute flags
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
enum Attribute
|
||||
{
|
||||
Default = 0, ///< Non-debug, compatibility context (this and the core attribute are mutually exclusive)
|
||||
Core = 1 << 0, ///< Core attribute
|
||||
Debug = 1 << 2 ///< Debug attribute
|
||||
};
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// \brief Default constructor
|
||||
///
|
||||
|
@ -43,14 +54,16 @@ struct ContextSettings
|
|||
/// \param antialiasing Antialiasing level
|
||||
/// \param major Major number of the context version
|
||||
/// \param minor Minor number of the context version
|
||||
/// \param attributes Attribute flags of the context
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
explicit ContextSettings(unsigned int depth = 0, unsigned int stencil = 0, unsigned int antialiasing = 0, unsigned int major = 2, unsigned int minor = 0) :
|
||||
explicit ContextSettings(unsigned int depth = 0, unsigned int stencil = 0, unsigned int antialiasing = 0, unsigned int major = 2, unsigned int minor = 1, unsigned int attributes = Default) :
|
||||
depthBits (depth),
|
||||
stencilBits (stencil),
|
||||
antialiasingLevel(antialiasing),
|
||||
majorVersion (major),
|
||||
minorVersion (minor)
|
||||
minorVersion (minor),
|
||||
attributeFlags (attributes)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -62,6 +75,7 @@ struct ContextSettings
|
|||
unsigned int antialiasingLevel; ///< Level of antialiasing
|
||||
unsigned int majorVersion; ///< Major number of the context version to create
|
||||
unsigned int minorVersion; ///< Minor number of the context version to create
|
||||
Uint32 attributeFlags; ///< The attribute flags to create the context with
|
||||
};
|
||||
|
||||
} // namespace sf
|
||||
|
@ -76,10 +90,11 @@ struct ContextSettings
|
|||
///
|
||||
/// ContextSettings allows to define several advanced settings
|
||||
/// of the OpenGL context attached to a window. All these
|
||||
/// settings have no impact on the regular SFML rendering
|
||||
/// (graphics module) -- except the anti-aliasing level, so
|
||||
/// you may need to use this structure only if you're using
|
||||
/// SFML as a windowing system for custom OpenGL rendering.
|
||||
/// settings with the exception of the compatibility flag
|
||||
/// and anti-aliasing level have no impact on the regular
|
||||
/// SFML rendering (graphics module), so you may need to use
|
||||
/// this structure only if you're using SFML as a windowing
|
||||
/// system for custom OpenGL rendering.
|
||||
///
|
||||
/// The depthBits and stencilBits members define the number
|
||||
/// of bits per pixel requested for the (respectively) depth
|
||||
|
@ -94,6 +109,32 @@ struct ContextSettings
|
|||
/// all handled the same way (i.e. you can use any version
|
||||
/// < 3.0 if you don't want an OpenGL 3 context).
|
||||
///
|
||||
/// When requesting a context with a version greater or equal
|
||||
/// to 3.2, you have the option of specifying whether the
|
||||
/// context should follow the core or compatibility profile
|
||||
/// of all newer (>= 3.2) OpenGL specifications. For versions
|
||||
/// 3.0 and 3.1 there is only the core profile. By default
|
||||
/// a compatibility context is created. You only need to specify
|
||||
/// the core flag if you want a core profile context to use with
|
||||
/// your own OpenGL rendering.
|
||||
/// <b>Warning: The graphics module will not function if you
|
||||
/// request a core profile context. Make sure the attributes are
|
||||
/// set to Default if you want to use the graphics module.</b>
|
||||
///
|
||||
/// Setting the debug attribute flag will request a context with
|
||||
/// additional debugging features enabled. Depending on the
|
||||
/// system, this might be required for advanced OpenGL debugging.
|
||||
/// OpenGL debugging is disabled by default.
|
||||
///
|
||||
/// <b>Special Note for OS X:</b>
|
||||
/// Apple only supports choosing between either a legacy context
|
||||
/// (OpenGL 2.1) or a core context (OpenGL version depends on the
|
||||
/// operating system version but is at least 3.2). Compatibility
|
||||
/// contexts are not supported. Further information is available on the
|
||||
/// <a href="https://developer.apple.com/opengl/capabilities/index.html">
|
||||
/// OpenGL Capabilities Tables</a> page. OS X also currently does
|
||||
/// not support debug contexts.
|
||||
///
|
||||
/// Please note that these values are only a hint.
|
||||
/// No failure will be reported if one or more of these values
|
||||
/// are not supported by the system; instead, SFML will try to
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue