Commit 5f262b45 authored by hybrid's avatar hybrid

Move wgl extension into platform specific init code.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2563 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 9e087c6d
...@@ -351,9 +351,14 @@ bool COpenGLDriver::initDriver(irr::SIrrlichtCreationParameters params) ...@@ -351,9 +351,14 @@ bool COpenGLDriver::initDriver(irr::SIrrlichtCreationParameters params)
genericDriverInit(params.WindowSize, params.Stencilbuffer); genericDriverInit(params.WindowSize, params.Stencilbuffer);
#ifdef WGL_EXT_swap_control
PFNWGLSWAPINTERVALEXTPROC wglSwapIntervalEXT;
// vsync extension
wglSwapIntervalEXT = (PFNWGLSWAPINTERVALEXTPROC)wglGetProcAddress("wglSwapIntervalEXT");
// set vsync // set vsync
if (wglSwapIntervalEXT) if (wglSwapIntervalEXT)
wglSwapIntervalEXT(params.Vsync ? 1 : 0); wglSwapIntervalEXT(params.Vsync ? 1 : 0);
#endif
// set exposed data // set exposed data
ExposedData.OpenGLWin32.HDc = HDc; ExposedData.OpenGLWin32.HDc = HDc;
......
...@@ -35,9 +35,7 @@ COpenGLExtensionHandler::COpenGLExtensionHandler() : ...@@ -35,9 +35,7 @@ COpenGLExtensionHandler::COpenGLExtensionHandler() :
pGlStencilFuncSeparate(0), pGlStencilOpSeparate(0), pGlStencilFuncSeparate(0), pGlStencilOpSeparate(0),
pGlStencilFuncSeparateATI(0), pGlStencilOpSeparateATI(0), pGlStencilFuncSeparateATI(0), pGlStencilOpSeparateATI(0),
pGlCompressedTexImage2D(0), pGlCompressedTexImage2D(0),
#ifdef _IRR_COMPILE_WITH_WINDOWS_DEVICE_ #if defined(GLX_SGI_swap_control)
wglSwapIntervalEXT(0),
#elif defined(GLX_SGI_swap_control)
glxSwapIntervalSGI(0), glxSwapIntervalSGI(0),
#endif #endif
pGlBindFramebufferEXT(0), pGlDeleteFramebuffersEXT(0), pGlGenFramebuffersEXT(0), pGlBindFramebufferEXT(0), pGlDeleteFramebuffersEXT(0), pGlGenFramebuffersEXT(0),
...@@ -183,9 +181,6 @@ void COpenGLExtensionHandler::initExtensions(bool stencilBuffer) ...@@ -183,9 +181,6 @@ void COpenGLExtensionHandler::initExtensions(bool stencilBuffer)
pGlGetBufferPointervARB= (PFNGLGETBUFFERPOINTERVARBPROC) wglGetProcAddress("glGetBufferPointervARB"); pGlGetBufferPointervARB= (PFNGLGETBUFFERPOINTERVARBPROC) wglGetProcAddress("glGetBufferPointervARB");
// vsync extension
wglSwapIntervalEXT = (PFNWGLSWAPINTERVALFARPROC) wglGetProcAddress("wglSwapIntervalEXT");
#elif defined(_IRR_COMPILE_WITH_X11_DEVICE_) || defined (_IRR_COMPILE_WITH_SDL_DEVICE_) #elif defined(_IRR_COMPILE_WITH_X11_DEVICE_) || defined (_IRR_COMPILE_WITH_SDL_DEVICE_)
#ifdef _IRR_OPENGL_USE_EXTPOINTER_ #ifdef _IRR_OPENGL_USE_EXTPOINTER_
......
...@@ -916,10 +916,7 @@ class COpenGLExtensionHandler ...@@ -916,10 +916,7 @@ class COpenGLExtensionHandler
PFNGLSTENCILFUNCSEPARATEATIPROC pGlStencilFuncSeparateATI; PFNGLSTENCILFUNCSEPARATEATIPROC pGlStencilFuncSeparateATI;
PFNGLSTENCILOPSEPARATEATIPROC pGlStencilOpSeparateATI; PFNGLSTENCILOPSEPARATEATIPROC pGlStencilOpSeparateATI;
PFNGLCOMPRESSEDTEXIMAGE2DPROC pGlCompressedTexImage2D; PFNGLCOMPRESSEDTEXIMAGE2DPROC pGlCompressedTexImage2D;
#ifdef _IRR_WINDOWS_API_ #if defined(_IRR_LINUX_PLATFORM_) && defined(GLX_SGI_swap_control)
typedef BOOL (APIENTRY *PFNWGLSWAPINTERVALFARPROC)(int);
PFNWGLSWAPINTERVALFARPROC wglSwapIntervalEXT;
#elif defined(_IRR_LINUX_PLATFORM_) && defined(GLX_SGI_swap_control)
PFNGLXSWAPINTERVALSGIPROC glxSwapIntervalSGI; PFNGLXSWAPINTERVALSGIPROC glxSwapIntervalSGI;
#endif #endif
PFNGLBINDFRAMEBUFFEREXTPROC pGlBindFramebufferEXT; PFNGLBINDFRAMEBUFFEREXTPROC pGlBindFramebufferEXT;
......
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