Commit b314794e authored by hybrid's avatar hybrid

Make FeatureAvailable array accessible to material renderers

New glext.h extension header and one new extension added.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3629 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 9478732c
...@@ -299,6 +299,7 @@ static const char* const OpenGLFeatureStrings[] = { ...@@ -299,6 +299,7 @@ static const char* const OpenGLFeatureStrings[] = {
"GL_EXT_texture_shared_exponent", "GL_EXT_texture_shared_exponent",
"GL_EXT_texture_snorm", "GL_EXT_texture_snorm",
"GL_EXT_texture_sRGB", "GL_EXT_texture_sRGB",
"GL_EXT_texture_sRGB_decode",
"GL_EXT_texture_swizzle", "GL_EXT_texture_swizzle",
"GL_EXT_timer_query", "GL_EXT_timer_query",
"GL_EXT_transform_feedback", "GL_EXT_transform_feedback",
...@@ -698,6 +699,7 @@ class COpenGLExtensionHandler ...@@ -698,6 +699,7 @@ class COpenGLExtensionHandler
IRR_EXT_texture_shared_exponent, IRR_EXT_texture_shared_exponent,
IRR_EXT_texture_snorm, IRR_EXT_texture_snorm,
IRR_EXT_texture_sRGB, IRR_EXT_texture_sRGB,
IRR_EXT_texture_sRGB_decode,
IRR_EXT_texture_swizzle, IRR_EXT_texture_swizzle,
IRR_EXT_timer_query, IRR_EXT_timer_query,
IRR_EXT_transform_feedback, IRR_EXT_transform_feedback,
...@@ -1044,10 +1046,10 @@ class COpenGLExtensionHandler ...@@ -1044,10 +1046,10 @@ class COpenGLExtensionHandler
void extGlGetQueryObjectiv(GLuint id, GLenum pname, GLint *params); void extGlGetQueryObjectiv(GLuint id, GLenum pname, GLint *params);
void extGlGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params); void extGlGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params);
protected:
// the global feature array // the global feature array
bool FeatureAvailable[IRR_OpenGL_Feature_Count]; bool FeatureAvailable[IRR_OpenGL_Feature_Count];
protected:
#if defined(_IRR_OPENGL_USE_EXTPOINTER_) #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
PFNGLACTIVETEXTUREARBPROC pGlActiveTextureARB; PFNGLACTIVETEXTUREARBPROC pGlActiveTextureARB;
PFNGLCLIENTACTIVETEXTUREARBPROC pGlClientActiveTextureARB; PFNGLCLIENTACTIVETEXTUREARBPROC pGlClientActiveTextureARB;
......
...@@ -29,9 +29,9 @@ extern "C" { ...@@ -29,9 +29,9 @@ extern "C" {
*/ */
/* Header file version number, required by OpenGL ABI for Linux */ /* Header file version number, required by OpenGL ABI for Linux */
/* glext.h last updated $Date: 2010-11-03 18:59:30 -0700 (Wed, 03 Nov 2010) $ */ /* glext.h last updated $Date: 2010-12-09 02:15:08 -0800 (Thu, 09 Dec 2010) $ */
/* Current version at http://www.opengl.org/registry/ */ /* Current version at http://www.opengl.org/registry/ */
#define GL_GLEXT_VERSION 66 #define GL_GLEXT_VERSION 67
/* Function declaration macros - to move into glplatform.h */ /* Function declaration macros - to move into glplatform.h */
#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
...@@ -5026,6 +5026,12 @@ extern "C" { ...@@ -5026,6 +5026,12 @@ extern "C" {
#define GL_DEPTH_CLAMP_FAR_AMD 0x901F #define GL_DEPTH_CLAMP_FAR_AMD 0x901F
#endif #endif
#ifndef GL_EXT_texture_sRGB_decode
#define GL_TEXTURE_SRGB_DECODE_EXT 0x8A48
#define GL_DECODE_EXT 0x8A49
#define GL_SKIP_DECODE_EXT 0x8A4A
#endif
/*************************************************************/ /*************************************************************/
...@@ -11031,6 +11037,10 @@ typedef void (APIENTRYP PFNGLVDPAUUNMAPSURFACESNVPROC) (GLsizei numSurface, cons ...@@ -11031,6 +11037,10 @@ typedef void (APIENTRYP PFNGLVDPAUUNMAPSURFACESNVPROC) (GLsizei numSurface, cons
#define GL_AMD_depth_clamp_separate 1 #define GL_AMD_depth_clamp_separate 1
#endif #endif
#ifndef GL_EXT_texture_sRGB_decode
#define GL_EXT_texture_sRGB_decode 1
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment