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 | 45c641b026ec75eac470fee1d89441ceb5eed024 (patch) | |
| tree | 7920ab293287b3ddfe599d6de9adbea641f62174 | |
| parent | 445f250fe8ab939222cfdcb4e774176cf2caf233 (diff) | |
| download | src-45c641b026ec75eac470fee1d89441ceb5eed024.tar.gz | |
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/third_party/mesa/MesaLib@52388 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | include/GL/osmesa.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/include/GL/osmesa.h b/include/GL/osmesa.h index 56fa23c..2327c79 100644 --- a/include/GL/osmesa.h +++ b/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 |