diff options
| author | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-13 20:09:58 +0000 |
|---|---|---|
| committer | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-13 20:09:58 +0000 |
| commit | 1c9526e0650a91e412d815417634c9f193b1a4d5 (patch) | |
| tree | 989046f0d01a9154987bb21fa65f736580d8df16 /third_party/mesa/MesaLib/src | |
| parent | ca488e19c17583ada1af51e2e27393981e4be772 (diff) | |
| download | chromium_src-1c9526e0650a91e412d815417634c9f193b1a4d5.zip chromium_src-1c9526e0650a91e412d815417634c9f193b1a4d5.tar.gz chromium_src-1c9526e0650a91e412d815417634c9f193b1a4d5.tar.bz2 | |
Added facility to compile Mesa EGL implementation. Fixed a few issues so that it can be compiled against standard EGL 1.4 headers.
Review URL: http://codereview.chromium.org/5750002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69040 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/mesa/MesaLib/src')
| -rw-r--r-- | third_party/mesa/MesaLib/src/egl/main/eglconfig.c | 4 | ||||
| -rw-r--r-- | third_party/mesa/MesaLib/src/egl/main/eglconfig.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/third_party/mesa/MesaLib/src/egl/main/eglconfig.c b/third_party/mesa/MesaLib/src/egl/main/eglconfig.c index 01e7144..ca28b5f 100644 --- a/third_party/mesa/MesaLib/src/egl/main/eglconfig.c +++ b/third_party/mesa/MesaLib/src/egl/main/eglconfig.c @@ -212,9 +212,11 @@ static const struct { ATTRIB_CRITERION_IGNORE, 0 }, +#ifdef EGL_NOK_texture_from_pixmap { EGL_Y_INVERTED_NOK, ATTRIB_TYPE_BOOLEAN, ATTRIB_CRITERION_EXACT, EGL_DONT_CARE }, +#endif }; @@ -489,8 +491,10 @@ _eglIsConfigAttribValid(_EGLConfig *conf, EGLint attr) case EGL_MATCH_NATIVE_PIXMAP: #endif return EGL_FALSE; +#ifdef EGL_NOK_texture_from_pixmap case EGL_Y_INVERTED_NOK: return conf->Display->Extensions.NOK_texture_from_pixmap; +#endif default: break; } diff --git a/third_party/mesa/MesaLib/src/egl/main/eglconfig.h b/third_party/mesa/MesaLib/src/egl/main/eglconfig.h index 0ad58cf..5eda345 100644 --- a/third_party/mesa/MesaLib/src/egl/main/eglconfig.h +++ b/third_party/mesa/MesaLib/src/egl/main/eglconfig.h @@ -49,8 +49,10 @@ _eglIndexConfig(const _EGLConfig *conf, EGLint key) return key - _EGL_CONFIG_FIRST_ATTRIB; switch (key) { +#ifdef EGL_NOK_texture_from_pixmap case EGL_Y_INVERTED_NOK: return _EGL_CONFIG_FIRST_EXTRA_ATTRIB; +#endif default: return -1; } |