diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2001-11-27 02:55:58 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2001-11-27 02:55:58 +0000 |
| commit | 253270dfcce980c88be6b21204a0c13a0becb2de (patch) | |
| tree | da79a43eec35d7f2554e8168afbda04b1834d5ab /src/glut/glx/glut_vidresize.c | |
| parent | 2f3d6203989e3a9843a548796b2c2062f470517e (diff) | |
use glXGetProcAddressARB to avoid extension linkage problems
Diffstat (limited to 'src/glut/glx/glut_vidresize.c')
| -rw-r--r-- | src/glut/glx/glut_vidresize.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/glut/glx/glut_vidresize.c b/src/glut/glx/glut_vidresize.c index 0146a29d8c..6024d9514a 100644 --- a/src/glut/glx/glut_vidresize.c +++ b/src/glut/glx/glut_vidresize.c @@ -57,7 +57,7 @@ glutVideoResizeGet(GLenum param) if (canVideoResize < 0) { canVideoResize = __glutIsSupportedByGLX("GLX_SGIX_video_resize"); if (canVideoResize) { -#if __sgi +#if defined(__sgi) && __sgi /* This is a hack because IRIX 6.2, 6.3, and some 6.4 versions were released with GLX_SGIX_video_resize being advertised by the X server though the video @@ -94,7 +94,8 @@ glutVideoResizeGet(GLenum param) #if defined(GLX_GLXEXT_PROTOTYPES) #endif - glXQueryChannelDeltasSGIX(__glutDisplay, __glutScreen, + + __glut_glXQueryChannelDeltasSGIX(__glutDisplay, __glutScreen, videoResizeChannel, &dx, &dy, &dw, &dh); /* glXQueryChannelDeltasSGIX is an inherent X server @@ -138,7 +139,7 @@ glutVideoResizeGet(GLenum param) if (videoResizeInUse) { int x, y, width, height; - glXQueryChannelRectSGIX(__glutDisplay, __glutScreen, + __glut_glXQueryChannelRectSGIX(__glutDisplay, __glutScreen, videoResizeChannel, &x, &y, &width, &height); switch (param) { case GLUT_VIDEO_RESIZE_X: @@ -164,7 +165,7 @@ glutSetupVideoResizing(void) { #if defined(GLX_VERSION_1_1) && defined(GLX_SGIX_video_resize) if (glutVideoResizeGet(GLUT_VIDEO_RESIZE_POSSIBLE)) { - glXBindChannelToWindowSGIX(__glutDisplay, __glutScreen, + __glut_glXBindChannelToWindowSGIX(__glutDisplay, __glutScreen, videoResizeChannel, __glutCurrentWindow->win); videoResizeInUse = 1; } else @@ -178,7 +179,7 @@ glutStopVideoResizing(void) #if defined(GLX_VERSION_1_1) && defined(GLX_SGIX_video_resize) if (glutVideoResizeGet(GLUT_VIDEO_RESIZE_POSSIBLE)) { if (videoResizeInUse) { - glXBindChannelToWindowSGIX(__glutDisplay, __glutScreen, + __glut_glXBindChannelToWindowSGIX(__glutDisplay, __glutScreen, videoResizeChannel, None); videoResizeInUse = 0; } @@ -196,10 +197,10 @@ glutVideoResize(int x, int y, int width, int height) /* glXChannelRectSyncSGIX introduced in a patch to IRIX 6.2; the original unpatched IRIX 6.2 behavior is always GLX_SYNC_SWAP_SGIX. */ - glXChannelRectSyncSGIX(__glutDisplay, __glutScreen, + __glut_glXChannelRectSyncSGIX(__glutDisplay, __glutScreen, videoResizeChannel, GLX_SYNC_SWAP_SGIX); #endif - glXChannelRectSGIX(__glutDisplay, __glutScreen, + __glut_glXChannelRectSGIX(__glutDisplay, __glutScreen, videoResizeChannel, x, y, width, height); } #endif @@ -218,10 +219,10 @@ glutVideoPan(int x, int y, int width, int height) accomplish GLX_SYNC_FRAME_SGIX on IRIX unpatched 6.2; this means you'd need a glutSwapBuffers to actually realize the video resize. */ - glXChannelRectSyncSGIX(__glutDisplay, __glutScreen, + __glut_glXChannelRectSyncSGIX(__glutDisplay, __glutScreen, videoResizeChannel, GLX_SYNC_FRAME_SGIX); #endif - glXChannelRectSGIX(__glutDisplay, __glutScreen, + __glut_glXChannelRectSGIX(__glutDisplay, __glutScreen, videoResizeChannel, x, y, width, height); } #endif |