diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-26 21:02:44 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-26 21:02:44 +0000 |
| commit | 8e314155222269d0f48e3986c618916f6aa15634 (patch) | |
| tree | d529a6a6d82f39198b4abcc0eb49b59d3e6ae931 /third_party/mesa | |
| parent | 41e3a47c68c73041695021d0fe56ec719c01da17 (diff) | |
| download | chromium_src-8e314155222269d0f48e3986c618916f6aa15634.zip chromium_src-8e314155222269d0f48e3986c618916f6aa15634.tar.gz chromium_src-8e314155222269d0f48e3986c618916f6aa15634.tar.bz2 | |
Windows OSMesa DLL only exports OSMesa functions.
It no longer exports all the GL functions like glClear. These are bound by calling OSMesaGetProcAddress.
glew no longer uses default mangled export name bind to OSMesaGetProcAddress.
TEST=trybots, check the pepper 3d plugin demos still work on windows
BUG=none
Review URL: http://codereview.chromium.org/1743004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45618 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/mesa')
| -rw-r--r-- | third_party/mesa/MesaLib/src/mesa/drivers/osmesa/osmesa.def | 1 | ||||
| -rw-r--r-- | third_party/mesa/README.chromium | 2 | ||||
| -rw-r--r-- | third_party/mesa/mesa.gyp | 7 |
3 files changed, 4 insertions, 6 deletions
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', ], }, ], |