diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 20:47:04 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 20:47:04 +0000 |
| commit | 30aa5c1ab237fa0940b04ffd78cc9033d9ca3afe (patch) | |
| tree | bcc87f53bf61028f8cd3fcf27d4218f287ad2155 /third_party | |
| parent | 6164c8d2a67aa8346b9f7735d849f4ee4f1c63cd (diff) | |
| download | chromium_src-30aa5c1ab237fa0940b04ffd78cc9033d9ca3afe.zip chromium_src-30aa5c1ab237fa0940b04ffd78cc9033d9ca3afe.tar.gz chromium_src-30aa5c1ab237fa0940b04ffd78cc9033d9ca3afe.tar.bz2 | |
Added --use-gl command line flag to select GL implementation.
- Options are desktop, egl and osmesa.
- Also added support for bliting an OSMesa bask buffer to a GDK window.
TEST=trybots, manual verification that WebGL and Pepper 3D work
BUG=45898
Review URL: http://codereview.chromium.org/2825005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52388 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/mesa/MesaLib/include/GL/osmesa.h | 16 | ||||
| -rw-r--r-- | third_party/mesa/README.chromium | 5 |
2 files changed, 15 insertions, 6 deletions
diff --git a/third_party/mesa/MesaLib/include/GL/osmesa.h b/third_party/mesa/MesaLib/include/GL/osmesa.h index 56fa23c..2327c79 100644 --- a/third_party/mesa/MesaLib/include/GL/osmesa.h +++ b/third_party/mesa/MesaLib/include/GL/osmesa.h @@ -101,9 +101,11 @@ extern "C" { typedef struct osmesa_context *OSMesaContext; -#if defined(__BEOS__) || defined(__QUICKDRAW__) -#pragma export on -#endif +// Disabled this because __QUICKDRAW__ is defined on Mac and gcc does not +// support the pragma. +//#if defined(__BEOS__) || defined(__QUICKDRAW__) +//#pragma export on +//#endif /* @@ -276,9 +278,11 @@ GLAPI void GLAPIENTRY OSMesaColorClamp(GLboolean enable); -#if defined(__BEOS__) || defined(__QUICKDRAW__) -#pragma export off -#endif +// Disabled this because __QUICKDRAW__ is defined on Mac and gcc does not +// support the pragma. +//#if defined(__BEOS__) || defined(__QUICKDRAW__) +//#pragma export off +//#endif #ifdef __cplusplus diff --git a/third_party/mesa/README.chromium b/third_party/mesa/README.chromium index 15efc64..050ad03 100644 --- a/third_party/mesa/README.chromium +++ b/third_party/mesa/README.chromium @@ -30,3 +30,8 @@ Later modifications: #if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__) # define PRAGMA_EXPORT_SUPPORTED 1 #endif + +- Commented out this in osmesa.h: +#if defined(__BEOS__) || defined(__QUICKDRAW__) +#pragma export on +#endif |