summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--third_party/glew/src/glew.c2
-rw-r--r--third_party/mesa/MesaLib/src/mesa/drivers/osmesa/osmesa.def1
-rw-r--r--third_party/mesa/README.chromium2
-rw-r--r--third_party/mesa/mesa.gyp7
4 files changed, 5 insertions, 7 deletions
diff --git a/third_party/glew/src/glew.c b/third_party/glew/src/glew.c
index a9fe3a5..9a16717 100644
--- a/third_party/glew/src/glew.c
+++ b/third_party/glew/src/glew.c
@@ -86,7 +86,7 @@ void* WinGetProcAddress(const GLubyte* name)
oglImage = LoadLibraryA("opengl32.dll");
}
else {
- osmesaGetProcAddress = (PFNOSMESAGETPROCADDRESSPROC) GetProcAddress(oglImage, "_OSMesaGetProcAddress@4");
+ osmesaGetProcAddress = (PFNOSMESAGETPROCADDRESSPROC) GetProcAddress(oglImage, "OSMesaGetProcAddress");
}
}
if (NULL != oglImage) {
diff --git a/third_party/mesa/MesaLib/src/mesa/drivers/osmesa/osmesa.def b/third_party/mesa/MesaLib/src/mesa/drivers/osmesa/osmesa.def
index 71e9687..b980845 100644
--- a/third_party/mesa/MesaLib/src/mesa/drivers/osmesa/osmesa.def
+++ b/third_party/mesa/MesaLib/src/mesa/drivers/osmesa/osmesa.def
@@ -11,3 +11,4 @@ EXPORTS
OSMesaGetIntegerv
OSMesaGetDepthBuffer
OSMesaGetColorBuffer
+ OSMesaGetProcAddress
diff --git a/third_party/mesa/README.chromium b/third_party/mesa/README.chromium
index 37c658d..f98b2e6 100644
--- a/third_party/mesa/README.chromium
+++ b/third_party/mesa/README.chromium
@@ -15,3 +15,5 @@ The license is in MesaLib/docs/license.html.
Modifications made with initial commit:
- Added the file README.chromium (this file)
+Later modifications:
+- Added OSMesaGetProcAddress to MesaLib/src/mesa/drivers/osmesa/osmesa.def
diff --git a/third_party/mesa/mesa.gyp b/third_party/mesa/mesa.gyp
index 63567a8..161a1b0 100644
--- a/third_party/mesa/mesa.gyp
+++ b/third_party/mesa/mesa.gyp
@@ -13,9 +13,6 @@
'MesaLib/include',
'MesaLib/src/mesa',
],
- 'defines': [
- 'BUILD_GL32',
- ],
'sources': [
'MesaLib/src/mesa/main/accum.c',
'MesaLib/src/mesa/main/api_arrayelt.c',
@@ -436,15 +433,13 @@
'MesaLib/src/mesa',
'MesaLib/src/mesa/drivers',
],
- 'defines': [
- 'BUILD_GL32',
- ],
'sources': [
'MesaLib/src/mesa/drivers/common/driverfuncs.c',
'MesaLib/src/mesa/drivers/common/driverfuncs.h',
'MesaLib/src/mesa/drivers/common/meta.c',
'MesaLib/src/mesa/drivers/common/meta.h',
'MesaLib/src/mesa/drivers/osmesa/osmesa.c',
+ 'MesaLib/src/mesa/drivers/osmesa/osmesa.def',
],
},
],