From 6eb02e5c5e009220ec408534c3224ecc7555b1d3 Mon Sep 17 00:00:00 2001 From: reimar Date: Thu, 28 Jan 2010 18:01:19 +0000 Subject: glXSwapIntervalEXT is defined to take different arguments from glXSwapIntervalSGI, so do not try to use it. Patch by Stephen Warren [swarren nvidia com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30450 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/gl_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libvo/gl_common.c') diff --git a/libvo/gl_common.c b/libvo/gl_common.c index b90debad59..1d67f6b516 100644 --- a/libvo/gl_common.c +++ b/libvo/gl_common.c @@ -441,7 +441,7 @@ static const extfunc_desc_t extfuncs[] = { {&ProgramString, "_program", {"glProgramStringARB", NULL}}, {&GetProgramiv, "_program", {"glGetProgramivARB", NULL}}, {&ProgramEnvParameter4f, "_program", {"glProgramEnvParameter4fARB", NULL}}, - {&SwapInterval, "_swap_control", {"glXSwapInterval", "glXSwapIntervalEXT", "glXSwapIntervalSGI", "wglSwapInterval", "wglSwapIntervalEXT", "wglSwapIntervalSGI", NULL}}, + {&SwapInterval, "_swap_control", {"glXSwapInterval", "glXSwapIntervalSGI", "wglSwapInterval", "wglSwapIntervalEXT", "wglSwapIntervalSGI", NULL}}, {&TexImage3D, NULL, {"glTexImage3D", NULL}}, {&AllocateMemoryMESA, "GLX_MESA_allocate_memory", {"glXAllocateMemoryMESA", NULL}}, {&FreeMemoryMESA, "GLX_MESA_allocate_memory", {"glXFreeMemoryMESA", NULL}}, -- cgit v1.2.3 From 2817539ee688a94978fb6fe2ad17630a4e6e433e Mon Sep 17 00:00:00 2001 From: reimar Date: Thu, 28 Jan 2010 18:06:47 +0000 Subject: Try the more specific names first for the SwapInterval function to make it less likely we get an incompatible one. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30451 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/gl_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libvo/gl_common.c') diff --git a/libvo/gl_common.c b/libvo/gl_common.c index 1d67f6b516..3e9263c9e9 100644 --- a/libvo/gl_common.c +++ b/libvo/gl_common.c @@ -441,7 +441,7 @@ static const extfunc_desc_t extfuncs[] = { {&ProgramString, "_program", {"glProgramStringARB", NULL}}, {&GetProgramiv, "_program", {"glGetProgramivARB", NULL}}, {&ProgramEnvParameter4f, "_program", {"glProgramEnvParameter4fARB", NULL}}, - {&SwapInterval, "_swap_control", {"glXSwapInterval", "glXSwapIntervalSGI", "wglSwapInterval", "wglSwapIntervalEXT", "wglSwapIntervalSGI", NULL}}, + {&SwapInterval, "_swap_control", {"glXSwapIntervalSGI", "glXSwapInterval", "wglSwapIntervalSGI", "wglSwapInterval", "wglSwapIntervalEXT", NULL}}, {&TexImage3D, NULL, {"glTexImage3D", NULL}}, {&AllocateMemoryMESA, "GLX_MESA_allocate_memory", {"glXAllocateMemoryMESA", NULL}}, {&FreeMemoryMESA, "GLX_MESA_allocate_memory", {"glXFreeMemoryMESA", NULL}}, -- cgit v1.2.3