Commit 37db2e6b authored by hybrid's avatar hybrid

Use the existing interfaces.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1547 dfc29bdd-3216-0410-991c-e03cc46cb475
parent d53f71bd
...@@ -65,8 +65,6 @@ namespace irr ...@@ -65,8 +65,6 @@ namespace irr
namespace video namespace video
{ {
class COpenGLTexture;
static const char* const OpenGLFeatureStrings[] = { static const char* const OpenGLFeatureStrings[] = {
"GL_3DFX_multisample", "GL_3DFX_multisample",
"GL_3DFX_tbuffer", "GL_3DFX_tbuffer",
...@@ -684,7 +682,6 @@ class COpenGLExtensionHandler ...@@ -684,7 +682,6 @@ class COpenGLExtensionHandler
IRR_OpenGL_Feature_Count IRR_OpenGL_Feature_Count
}; };
friend class COpenGLTexture;
// constructor // constructor
COpenGLExtensionHandler(); COpenGLExtensionHandler();
......
...@@ -401,14 +401,14 @@ void* COpenGLTexture::lock(bool readOnly) ...@@ -401,14 +401,14 @@ void* COpenGLTexture::lock(bool readOnly)
// allows to read pixels in top-to-bottom order // allows to read pixels in top-to-bottom order
#ifdef GL_MESA_pack_invert #ifdef GL_MESA_pack_invert
if (Driver->FeatureAvailable[COpenGLExtensionHandler::IRR_MESA_pack_invert]) if (Driver->queryOpenGLFeature(COpenGLExtensionHandler::IRR_MESA_pack_invert))
glPixelStorei(GL_PACK_INVERT_MESA, GL_TRUE); glPixelStorei(GL_PACK_INVERT_MESA, GL_TRUE);
#endif #endif
glGetTexImage(GL_TEXTURE_2D, 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE, pPixels); glGetTexImage(GL_TEXTURE_2D, 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE, pPixels);
#ifdef GL_MESA_pack_invert #ifdef GL_MESA_pack_invert
if (Driver->FeatureAvailable[COpenGLExtensionHandler::IRR_MESA_pack_invert]) if (Driver->queryOpenGLFeature(COpenGLExtensionHandler::IRR_MESA_pack_invert))
glPixelStorei(GL_PACK_INVERT_MESA, GL_FALSE); glPixelStorei(GL_PACK_INVERT_MESA, GL_FALSE);
else else
#endif #endif
......
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