From 4c996c06702b3a19943ab8c388563f6ec07c525b Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Tue, 13 Nov 2007 10:50:33 +0000 Subject: [PATCH] Thx Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) testing Mesa3D 7.0.1 with all bugfix we have done, thanks to all bugfix we can remove a smaller hack we did frist in glapi.c Mesa3D 7.0.1 does not working in ReactOS with SSE support. if we disable it, Quake 3 will work fine. svn path=/trunk/; revision=30415 --- .../3rdparty/mesa32/mesa3d_icd_fix_ros.patch | 20 +------------------ reactos/dll/3rdparty/mesa32/src/glapi/glapi.c | 8 ++++++++ 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/reactos/dll/3rdparty/mesa32/mesa3d_icd_fix_ros.patch b/reactos/dll/3rdparty/mesa32/mesa3d_icd_fix_ros.patch index d709ed130e7..42ff63d48c2 100644 --- a/reactos/dll/3rdparty/mesa32/mesa3d_icd_fix_ros.patch +++ b/reactos/dll/3rdparty/mesa32/mesa3d_icd_fix_ros.patch @@ -222,22 +222,4 @@ Index: drivers/windows/icd/mesa.def _tnl_InvalidateState - _tnl_MakeCurrent _tnl_run_pipeline -Index: glapi/glapi.c -=================================================================== ---- glapi/glapi.c (revision 30408) -+++ glapi/glapi.c (working copy) -@@ -876,14 +876,6 @@ - struct _glapi_function * entry; - GLuint i; - --#ifdef MANGLE -- if (funcName[0] != 'm' || funcName[1] != 'g' || funcName[2] != 'l') -- return NULL; --#else -- if (funcName[0] != 'g' || funcName[1] != 'l') -- return NULL; --#endif -- - /* search extension functions first */ - for (i = 0; i < NumExtEntryPoints; i++) { - if (strcmp(ExtEntryTable[i].name, funcName) == 0) { + diff --git a/reactos/dll/3rdparty/mesa32/src/glapi/glapi.c b/reactos/dll/3rdparty/mesa32/src/glapi/glapi.c index ef6636905ac..1fe6b4f0fd7 100644 --- a/reactos/dll/3rdparty/mesa32/src/glapi/glapi.c +++ b/reactos/dll/3rdparty/mesa32/src/glapi/glapi.c @@ -876,6 +876,14 @@ _glapi_get_proc_address(const char *funcName) struct _glapi_function * entry; GLuint i; +#ifdef MANGLE + if (funcName[0] != 'm' || funcName[1] != 'g' || funcName[2] != 'l') + return NULL; +-#else + if (funcName[0] != 'g' || funcName[1] != 'l') + return NULL; +#endif + /* search extension functions first */ for (i = 0; i < NumExtEntryPoints; i++) { if (strcmp(ExtEntryTable[i].name, funcName) == 0) {