diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-16 17:57:36 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-16 17:57:36 +0000 |
| commit | 86be5d085562b134a353faffe5c737470f0a1788 (patch) | |
| tree | 5f126b106b49c24711c56c97890e129a3c794e8d /third_party | |
| parent | 14055fca73ef88666127f1f9c3b1c62d2ea683f7 (diff) | |
| download | chromium_src-86be5d085562b134a353faffe5c737470f0a1788.zip chromium_src-86be5d085562b134a353faffe5c737470f0a1788.tar.gz chromium_src-86be5d085562b134a353faffe5c737470f0a1788.tar.bz2 | |
Move code around to fix build with system mesa.
BUG=161389
Review URL: https://codereview.chromium.org/11973003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177172 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/khronos/EGL/eglext.h | 11 | ||||
| -rw-r--r-- | third_party/khronos/README.chromium | 21 |
2 files changed, 3 insertions, 29 deletions
diff --git a/third_party/khronos/EGL/eglext.h b/third_party/khronos/EGL/eglext.h index 8053647..93a7365 100644 --- a/third_party/khronos/EGL/eglext.h +++ b/third_party/khronos/EGL/eglext.h @@ -470,17 +470,6 @@ EGLAPI EGLint EGLAPIENTRY eglWaitSyncKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLint typedef EGLint (EGLAPIENTRYP PFNEGLWAITSYNCKHRPROC)(EGLDisplay dpy, EGLSyncKHR sync, EGLint flags); #endif -#if KHRONOS_SUPPORT_INT64 /* EGLSyncControlCHROMIUM requires 64-bit uint support */ -#ifndef EGL_CHROMIUM_sync_control -#define EGL_CHROMIUM_sync_control 1 -typedef khronos_uint64_t EGLuint64CHROMIUM; -#ifdef EGL_EGLEXT_PROTOTYPES -EGLAPI EGLBoolean EGLAPIENTRY eglGetSyncValuesCHROMIUM(EGLDisplay dpy, EGLSurface surface, EGLuint64CHROMIUM *ust, EGLuint64CHROMIUM *msc, EGLuint64CHROMIUM *sbc); -#endif /* EGL_EGLEXT_PROTOTYPES */ -typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCVALUESCHROMIUMPROC)(EGLDisplay dpy, EGLSurface surface, EGLuint64CHROMIUM *ust, EGLuint64CHROMIUM *msc, EGLuint64CHROMIUM *sbc); -#endif -#endif - #ifdef __cplusplus } #endif diff --git a/third_party/khronos/README.chromium b/third_party/khronos/README.chromium index 285f1d6..b47cb03 100644 --- a/third_party/khronos/README.chromium +++ b/third_party/khronos/README.chromium @@ -16,31 +16,16 @@ for GLES2/*. Local Modifications: +NOTE: Please add Chromium-specific declarations to files in gpu/{GL,EGL,GLES2} +and not here. + GLES2/gl2.h - Added GL_CONTEXT_LOST constant. - Added include of gl2chromium.h GLES2/gl2ext.h - Added Chromium and Angle extensions. - - Added GL_ANGLE_instanced_arrays - - Added GL_ARB_robustness (subsetted) - - Added GL_ARB_texture_rectangle (subsetted) - - Added GL_CHROMIUM_async_pixel_transfers - - Added GL_CHROMIUM_bind_uniform_location - - Added GL_CHROMIUM_command_buffer_latency_query - - Added GL_CHROMIUM_command_buffer_query - - Added GL_CHROMIUM_copy_texture - - Added GL_CHROMIUM_get_error_query - - Added GL_CHROMIUM_gpu_memory_manager - - Added GL_CHROMIUM_iosurface - - Added GL_CHROMIUM_lose_context - - Added GL_CHROMIUM_pixel_transfer_buffer_object - - Added GL_CHROMIUM_texture_from_image - - Added GL_EXT_framebuffer_multisample - - Added GL_NVX_gpu_memory_info - Added include of gl2chromium.h EGL/eglplatform.h - Added EGLNative*Type for Mac. DEPS - Added DEPS file to prevent inclusion of external dependencies. -EGL/eglext.h - - Added EGL_CHROMIUM_sync_control |