diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-18 14:34:04 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-04 11:15:27 +0000 |
| commit | e6430e577f105ad8813c92e75c54660c4985026e (patch) | |
| tree | 88115e5d1fb471fea807111924dcccbeadbf9e4f /chromium/third_party/khronos | |
| parent | 53d399fe6415a96ea6986ec0d402a9c07da72453 (diff) | |
| download | qtwebengine-chromium-e6430e577f105ad8813c92e75c54660c4985026e.tar.gz | |
BASELINE: Update Chromium to 61.0.3163.99
Change-Id: I8452f34574d88ca2b27af9bd56fc9ff3f16b1367
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/third_party/khronos')
| -rw-r--r-- | chromium/third_party/khronos/EGL/eglext.h | 26 | ||||
| -rw-r--r-- | chromium/third_party/khronos/EGL/eglplatform.h | 2 | ||||
| -rw-r--r-- | chromium/third_party/khronos/README.chromium | 2 |
3 files changed, 29 insertions, 1 deletions
diff --git a/chromium/third_party/khronos/EGL/eglext.h b/chromium/third_party/khronos/EGL/eglext.h index b6811a1eee3..d07a7b730f6 100644 --- a/chromium/third_party/khronos/EGL/eglext.h +++ b/chromium/third_party/khronos/EGL/eglext.h @@ -1214,6 +1214,32 @@ typedef EGLBoolean(EGLAPIENTRYP PFNGLEGLIMAGEFLUSHEXTERNALEXT)( #endif #endif +#ifndef EGL_ANGLE_stream_producer_d3d_texture_nv12 +#define EGL_ANGLE_stream_producer_d3d_texture_nv12 +#define EGL_D3D_TEXTURE_SUBRESOURCE_ID_ANGLE 0x33AB +typedef EGLBoolean( + EGLAPIENTRYP PFNEGLCREATESTREAMPRODUCERD3DTEXTURENV12ANGLEPROC)( + EGLDisplay dpy, + EGLStreamKHR stream, + const EGLAttrib* attrib_list); +typedef EGLBoolean(EGLAPIENTRYP PFNEGLSTREAMPOSTD3DTEXTURENV12ANGLEPROC)( + EGLDisplay dpy, + EGLStreamKHR stream, + void* texture, + const EGLAttrib* attrib_list); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY +eglCreateStreamProducerD3DTextureNV12ANGLE(EGLDisplay dpy, + EGLStreamKHR stream, + const EGLAttrib* attrib_list); +EGLAPI EGLBoolean EGLAPIENTRY +eglStreamPostD3DTextureNV12ANGLE(EGLDisplay dpy, + EGLStreamKHR stream, + void* texture, + const EGLAttrib* attrib_list); +#endif +#endif + #ifdef __cplusplus } #endif diff --git a/chromium/third_party/khronos/EGL/eglplatform.h b/chromium/third_party/khronos/EGL/eglplatform.h index dfbc52cea2a..fad491b45af 100644 --- a/chromium/third_party/khronos/EGL/eglplatform.h +++ b/chromium/third_party/khronos/EGL/eglplatform.h @@ -77,7 +77,7 @@ typedef HDC EGLNativeDisplayType; typedef HBITMAP EGLNativePixmapType; typedef HWND EGLNativeWindowType; -#elif defined(__WINSCW__) || defined(__SYMBIAN32__) /* Symbian */ +#elif defined(__WINSCW__) || defined(__SYMBIAN32__) || defined(__Fuchsia__) typedef int EGLNativeDisplayType; typedef void *EGLNativeWindowType; diff --git a/chromium/third_party/khronos/README.chromium b/chromium/third_party/khronos/README.chromium index 82662e6efd1..e6b667f8908 100644 --- a/chromium/third_party/khronos/README.chromium +++ b/chromium/third_party/khronos/README.chromium @@ -31,8 +31,10 @@ GLES2/gl2ext.h EGL/eglplatform.h - Added EGLNative*Type for Mac. - Added EGLNative*Type for native linux framebuffers. + - Added EGLNative*Type for Fuchsia. EGL/eglext.h - Added support for EGL_EXT_image_flush_external extension + - Added support for EGL_ANGLE_stream_producer_d3d_texture_nv12 KHR/khrplatform.h - Modified KHRONOS_APICALL DEPS |