Alexandre Julliard : Revert "opengl32: Store alternative function in wglGetProcAddress."
Alexandre Julliard
julliard at wine.codeweavers.com
Sat Dec 12 10:41:42 CST 2015
Module: wine
Branch: master
Commit: 50da224be714a623a76646bbd6582b8d802a3d5d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=50da224be714a623a76646bbd6582b8d802a3d5d
Author: Alexandre Julliard <julliard at winehq.org>
Date: Sat Dec 12 05:24:56 2015 +0100
Revert "opengl32: Store alternative function in wglGetProcAddress."
This reverts commit e44f8eaa0fce02032e6c3f43052821f40eaba53b.
It mixes up the driver function and the WINAPI wrapper.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/opengl32/wgl.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index 3b817a4..88aa564 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -884,15 +884,15 @@ PROC WINAPI wglGetProcAddress( LPCSTR name )
{ "glCopyTexSubImage3DEXT", "glCopyTexSubImage3D" }, /* needed by RuneScape */
};
- WARN("Extension %s required for %s not supported\n", ext_ret->extension, name);
- driver_func = NULL;
-
- for (i = 0; i < sizeof(alternatives)/sizeof(alternatives[0]) && !driver_func; i++)
+ for (i = 0; i < sizeof(alternatives)/sizeof(alternatives[0]); i++)
{
if (strcmp( name, alternatives[i].name )) continue;
- WARN("Trying alternative %s for %s\n", alternatives[i].alt, name );
- driver_func = wglGetProcAddress( alternatives[i].alt );
+ WARN("Extension %s required for %s not supported, trying %s\n",
+ ext_ret->extension, name, alternatives[i].alt );
+ return wglGetProcAddress( alternatives[i].alt );
}
+ WARN("Extension %s required for %s not supported\n", ext_ret->extension, name);
+ return NULL;
}
if (driver_func == NULL)
More information about the wine-cvs
mailing list