Commit 0f433a50 authored by Jeff Gilbert's avatar Jeff Gilbert
Browse files

Bug 1691547 - Update ESR78's gfx/angle to match FF87. r=lsalzman, a=RyanVM 

Differential Revision: https://phabricator.services.mozilla.com/D107594
parent 884ad073

gfx/angle/MERGE_BASE

+1 −1
Original line number Diff line number Diff line 
chromium/3865
 
chromium/4324

gfx/angle/checkout/include/EGL/egl.h

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ extern "C" { 
** used to make the header, and the header can be found at

**   http://www.khronos.org/registry/egl

**

** Khronos $Git commit SHA1: d738c39fe2 $ on $Git commit date: 2019-06-14 16:17:31 -0600 $

** Khronos $Git commit SHA1: cb927ca98d $ on $Git commit date: 2019-08-08 01:05:38 -0700 $

*/



#include <EGL/eglplatform.h>
@@ -42,7 +42,7 @@ extern "C" { 
#define EGL_EGL_PROTOTYPES 1

#endif



/* Generated on date 20190716 */

/* Generated on date 20190808 */



/* Generated C header for:

 * API: egl

gfx/angle/checkout/include/EGL/eglext.h

+55 −4
Original line number Diff line number Diff line
@@ -28,17 +28,17 @@ extern "C" { 
** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.

*/

/*

** This header is generated from the Khronos OpenGL / OpenGL ES XML

** API Registry. The current version of the Registry, generator scripts

** This header is generated from the Khronos EGL XML API Registry.

** The current version of the Registry, generator scripts

** used to make the header, and the header can be found at

**   http://www.khronos.org/registry/egl

**

** Khronos $Git commit SHA1: bae3518c48 $ on $Git commit date: 2018-05-17 10:56:57 -0700 $

** Khronos $Git commit SHA1: cb927ca98d $ on $Git commit date: 2019-08-08 01:05:38 -0700 $

*/



#include <EGL/eglplatform.h>



#define EGL_EGLEXT_VERSION 20180517

#define EGL_EGLEXT_VERSION 20190808



/* Generated C header for:

 * API: egl
@@ -462,6 +462,10 @@ EGLAPI EGLint EGLAPIENTRY eglWaitSyncKHR (EGLDisplay dpy, EGLSyncKHR sync, EGLin 
#endif

#endif /* EGL_KHR_wait_sync */



#ifndef EGL_ANDROID_GLES_layers

#define EGL_ANDROID_GLES_layers 1

#endif /* EGL_ANDROID_GLES_layers */



#ifndef EGL_ANDROID_blob_cache

#define EGL_ANDROID_blob_cache 1

typedef khronos_ssize_t EGLsizeiANDROID;
@@ -681,6 +685,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribEXT (EGLDisplay dpy, EGLint a 
#ifndef EGL_EXT_device_drm

#define EGL_EXT_device_drm 1

#define EGL_DRM_DEVICE_FILE_EXT           0x3233

#define EGL_DRM_MASTER_FD_EXT             0x333C

#endif /* EGL_EXT_device_drm */



#ifndef EGL_EXT_device_enumeration
@@ -716,6 +721,11 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribEXT (EGLDisplay dpy, EGLint a 
#define EGL_GL_COLORSPACE_DISPLAY_P3_LINEAR_EXT 0x3362

#endif /* EGL_EXT_gl_colorspace_display_p3_linear */



#ifndef EGL_EXT_gl_colorspace_display_p3_passthrough

#define EGL_EXT_gl_colorspace_display_p3_passthrough 1

#define EGL_GL_COLORSPACE_DISPLAY_P3_PASSTHROUGH_EXT 0x3490

#endif /* EGL_EXT_gl_colorspace_display_p3_passthrough */



#ifndef EGL_EXT_gl_colorspace_scrgb

#define EGL_EXT_gl_colorspace_scrgb 1

#define EGL_GL_COLORSPACE_SCRGB_EXT       0x3351
@@ -1025,6 +1035,16 @@ EGLAPI EGLBoolean EGLAPIENTRY eglExportDMABUFImageMESA (EGLDisplay dpy, EGLImage 
#define EGL_PLATFORM_SURFACELESS_MESA     0x31DD

#endif /* EGL_MESA_platform_surfaceless */



#ifndef EGL_MESA_query_driver

#define EGL_MESA_query_driver 1

typedef char *(EGLAPIENTRYP PFNEGLGETDISPLAYDRIVERCONFIGPROC) (EGLDisplay dpy);

typedef const char *(EGLAPIENTRYP PFNEGLGETDISPLAYDRIVERNAMEPROC) (EGLDisplay dpy);

#ifdef EGL_EGLEXT_PROTOTYPES

EGLAPI char *EGLAPIENTRY eglGetDisplayDriverConfig (EGLDisplay dpy);

EGLAPI const char *EGLAPIENTRY eglGetDisplayDriverName (EGLDisplay dpy);

#endif

#endif /* EGL_MESA_query_driver */



#ifndef EGL_NOK_swap_region

#define EGL_NOK_swap_region 1

typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSREGIONNOKPROC) (EGLDisplay dpy, EGLSurface surface, EGLint numRects, const EGLint *rects);
@@ -1113,6 +1133,11 @@ EGLAPI EGLBoolean EGLAPIENTRY eglPostSubBufferNV (EGLDisplay dpy, EGLSurface sur 
#endif

#endif /* EGL_NV_post_sub_buffer */



#ifndef EGL_NV_quadruple_buffer

#define EGL_NV_quadruple_buffer 1

#define EGL_QUADRUPLE_BUFFER_NV           0x3231

#endif /* EGL_NV_quadruple_buffer */



#ifndef EGL_NV_robustness_video_memory_purge

#define EGL_NV_robustness_video_memory_purge 1

#define EGL_GENERATE_RESET_ON_VIDEO_MEMORY_PURGE_NV 0x334C
@@ -1154,6 +1179,12 @@ EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerGLTextureExternalAttribsNV (EGLDi 
#define EGL_STREAM_CROSS_SYSTEM_NV        0x334F

#endif /* EGL_NV_stream_cross_system */



#ifndef EGL_NV_stream_dma

#define EGL_NV_stream_dma 1

#define EGL_STREAM_DMA_NV                 0x3371

#define EGL_STREAM_DMA_SERVER_NV          0x3372

#endif /* EGL_NV_stream_dma */



#ifndef EGL_NV_stream_fifo_next

#define EGL_NV_stream_fifo_next 1

#define EGL_PENDING_FRAME_NV              0x3329
@@ -1205,6 +1236,21 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryStreamMetadataNV (EGLDisplay dpy, EGLStrea 
#endif

#endif /* EGL_NV_stream_metadata */



#ifndef EGL_NV_stream_origin

#define EGL_NV_stream_origin 1

#define EGL_STREAM_FRAME_ORIGIN_X_NV      0x3366

#define EGL_STREAM_FRAME_ORIGIN_Y_NV      0x3367

#define EGL_STREAM_FRAME_MAJOR_AXIS_NV    0x3368

#define EGL_CONSUMER_AUTO_ORIENTATION_NV  0x3369

#define EGL_PRODUCER_AUTO_ORIENTATION_NV  0x336A

#define EGL_LEFT_NV                       0x336B

#define EGL_RIGHT_NV                      0x336C

#define EGL_TOP_NV                        0x336D

#define EGL_BOTTOM_NV                     0x336E

#define EGL_X_AXIS_NV                     0x336F

#define EGL_Y_AXIS_NV                     0x3370

#endif /* EGL_NV_stream_origin */



#ifndef EGL_NV_stream_remote

#define EGL_NV_stream_remote 1

#define EGL_STREAM_STATE_INITIALIZING_NV  0x3240
@@ -1301,6 +1347,11 @@ EGLAPI EGLuint64NV EGLAPIENTRY eglGetSystemTimeNV (void); 
#endif /* KHRONOS_SUPPORT_INT64 */

#endif /* EGL_NV_system_time */



#ifndef EGL_NV_triple_buffer

#define EGL_NV_triple_buffer 1

#define EGL_TRIPLE_BUFFER_NV              0x3230

#endif /* EGL_NV_triple_buffer */



#ifndef EGL_TIZEN_image_native_buffer

#define EGL_TIZEN_image_native_buffer 1

#define EGL_NATIVE_BUFFER_TIZEN           0x32A0

gfx/angle/checkout/include/EGL/eglext_angle.h

+104 −4
Original line number Diff line number Diff line 
//

// Copyright (c) 2017 The ANGLE Project Authors. All rights reserved.

// Copyright 2017 The ANGLE Project Authors. All rights reserved.

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

//
@@ -25,6 +25,8 @@ 
#ifndef EGL_ANGLE_d3d_texture_client_buffer

#define EGL_ANGLE_d3d_texture_client_buffer 1

#define EGL_D3D_TEXTURE_ANGLE             0x33A3

#define EGL_TEXTURE_OFFSET_X_ANGLE        0x3490

#define EGL_TEXTURE_OFFSET_Y_ANGLE        0x3491

#endif /* EGL_ANGLE_d3d_texture_client_buffer */



#ifndef EGL_ANGLE_software_display
@@ -54,6 +56,7 @@ 
#define EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE 0x3209

#define EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE 0x320A

#define EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE 0x345E

#define EGL_PLATFORM_ANGLE_NATIVE_PLATFORM_TYPE_ANGLE 0x348F

#endif /* EGL_ANGLE_platform_angle */



#ifndef EGL_ANGLE_platform_angle_d3d
@@ -65,6 +68,17 @@ 
#define EGL_PLATFORM_ANGLE_ENABLE_AUTOMATIC_TRIM_ANGLE 0x320F

#endif /* EGL_ANGLE_platform_angle_d3d */



#ifndef EGL_ANGLE_platform_angle_d3d_luid

#define EGL_ANGLE_platform_angle_d3d_luid 1

#define EGL_PLATFORM_ANGLE_D3D_LUID_HIGH_ANGLE 0x34A0

#define EGL_PLATFORM_ANGLE_D3D_LUID_LOW_ANGLE 0x34A1

#endif /* EGL_ANGLE_platform_angle_d3d_luid */



#ifndef EGL_ANGLE_platform_angle_d3d11on12

#define EGL_ANGLE_platform_angle_d3d11on12 1

#define EGL_PLATFORM_ANGLE_D3D11ON12_ANGLE 0x3488

#endif /* EGL_ANGLE_platform_angle_d3d11on12 */



#ifndef EGL_ANGLE_platform_angle_opengl

#define EGL_ANGLE_platform_angle_opengl 1

#define EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE 0x320D
@@ -80,13 +94,40 @@ 
#ifndef EGL_ANGLE_platform_angle_vulkan

#define EGL_ANGLE_platform_angle_vulkan 1

#define EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE 0x3450

#define EGL_PLATFORM_VULKAN_DISPLAY_MODE_SIMPLE_ANGLE 0x34A4

#define EGL_PLATFORM_VULKAN_DISPLAY_MODE_HEADLESS_ANGLE 0x34A5

#endif /* EGL_ANGLE_platform_angle_vulkan */



#ifndef EGL_ANGLE_platform_angle_metal

#define EGL_ANGLE_platform_angle_metal 1

#define EGL_PLATFORM_ANGLE_TYPE_METAL_ANGLE 0x3489

#endif /* EGL_ANGLE_platform_angle_metal  */



#ifndef EGL_ANGLE_platform_angle_device_type_swiftshader

#define EGL_ANGLE_platform_angle_device_type_swiftshader

#define EGL_PLATFORM_ANGLE_DEVICE_TYPE_SWIFTSHADER_ANGLE 0x3487

#endif /* EGL_ANGLE_platform_angle_device_type_swiftshader */



#ifndef EGL_ANGLE_platform_angle_device_type_egl_angle

#define EGL_ANGLE_platform_angle_device_type_egl_angle

#define EGL_PLATFORM_ANGLE_DEVICE_TYPE_EGL_ANGLE 0x348E

#endif /* EGL_ANGLE_platform_angle_device_type_egl_angle */



#ifndef EGL_ANGLE_platform_angle_context_virtualization

#define EGL_ANGLE_platform_angle_context_virtualization 1

#define EGL_PLATFORM_ANGLE_CONTEXT_VIRTUALIZATION_ANGLE 0x3481

#endif /* EGL_ANGLE_platform_angle_context_virtualization */



#ifndef EGL_ANGLE_platform_angle_device_context_volatile_eagl

#define EGL_ANGLE_platform_angle_device_context_volatile_eagl 1

#define EGL_PLATFORM_ANGLE_DEVICE_CONTEXT_VOLATILE_EAGL_ANGLE 0x34A2

#endif /* EGL_ANGLE_platform_angle_device_context_volatile_eagl */



#ifndef EGL_ANGLE_platform_angle_device_context_volatile_cgl

#define EGL_ANGLE_platform_angle_device_context_volatile_cgl 1

#define EGL_PLATFORM_ANGLE_DEVICE_CONTEXT_VOLATILE_CGL_ANGLE 0x34A3

#endif /* EGL_ANGLE_platform_angle_device_context_volatile_cgl */



#ifndef EGL_ANGLE_x11_visual

#define EGL_ANGLE_x11_visual

#define EGL_X11_VISUAL_ID_ANGLE 0x33A3
@@ -179,6 +220,10 @@ EGLAPI EGLint EGLAPIENTRY eglProgramCacheResizeANGLE(EGLDisplay dpy, EGLint limi 
#define EGL_TEXTURE_RECTANGLE_ANGLE 0x345B

#define EGL_TEXTURE_TYPE_ANGLE 0x345C

#define EGL_TEXTURE_INTERNAL_FORMAT_ANGLE 0x345D

#define EGL_IOSURFACE_USAGE_HINT_ANGLE 0x348A

#define EGL_IOSURFACE_READ_HINT_ANGLE 0x0001

#define EGL_IOSURFACE_WRITE_HINT_ANGLE 0x0002

#define EGL_BIND_TO_TEXTURE_TARGET_ANGLE 0x348D

#endif /* EGL_ANGLE_iosurface_client_buffer */



#ifndef EGL_ANGLE_create_context_extensions_enabled
@@ -186,8 +231,8 @@ EGLAPI EGLint EGLAPIENTRY eglProgramCacheResizeANGLE(EGLDisplay dpy, EGLint limi 
#define EGL_EXTENSIONS_ENABLED_ANGLE 0x345F

#endif /* EGL_ANGLE_create_context_extensions_enabled */



#ifndef EGL_CHROMIUM_get_sync_values

#define EGL_CHROMIUM_get_sync_values 1

#ifndef EGL_CHROMIUM_sync_control

#define EGL_CHROMIUM_sync_control 1

typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCVALUESCHROMIUMPROC) (EGLDisplay dpy,

                                                             EGLSurface surface,

                                                             EGLuint64KHR *ust,
@@ -200,13 +245,35 @@ EGLAPI EGLBoolean EGLAPIENTRY eglGetSyncValuesCHROMIUM(EGLDisplay dpy, 
                                                             EGLuint64KHR *msc,

                                                             EGLuint64KHR *sbc);

#endif

#endif /* EGL_CHROMIUM_get_sync_values */

#endif /* EGL_CHROMIUM_sync_control */



#ifndef EGL_ANGLE_sync_control_rate

#define EGL_ANGLE_sync_control_rate 1

typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETMSCRATEANGLEPROC) (EGLDisplay dpy,

                                                             EGLSurface surface,

                                                             EGLint *numerator,

                                                             EGLint *denominator);

#ifdef EGL_EGLEXT_PROTOTYPES

EGLAPI EGLBoolean EGLAPIENTRY eglGetMscRateANGLE(EGLDisplay dpy,

                                                             EGLSurface surface,

                                                             EGLint *numerator,

                                                             EGLint *denominator);

#endif

#endif /* EGL_ANGLE_sync_control_rate */



#ifndef EGL_ANGLE_power_preference

#define EGL_ANGLE_power_preference 1

#define EGL_POWER_PREFERENCE_ANGLE 0x3482

#define EGL_LOW_POWER_ANGLE 0x0001

#define EGL_HIGH_POWER_ANGLE 0x0002

typedef void(EGLAPIENTRYP PFNEGLRELEASEHIGHPOWERGPUANGLEPROC) (EGLDisplay dpy, EGLContext ctx);

typedef void(EGLAPIENTRYP PFNEGLREACQUIREHIGHPOWERGPUANGLEPROC) (EGLDisplay dpy, EGLContext ctx);

typedef void(EGLAPIENTRYP PFNEGLHANDLEGPUSWITCHANGLEPROC) (EGLDisplay dpy);

#ifdef EGL_EGLEXT_PROTOTYPES

EGLAPI void EGLAPIENTRY eglReleaseHighPowerGPUANGLE(EGLDisplay dpy, EGLContext ctx);

EGLAPI void EGLAPIENTRY eglReacquireHighPowerGPUANGLE(EGLDisplay dpy, EGLContext ctx);

EGLAPI void EGLAPIENTRY eglHandleGPUSwitchANGLE(EGLDisplay dpy);

#endif

#endif /* EGL_ANGLE_power_preference */



#ifndef EGL_ANGLE_feature_control
@@ -219,6 +286,8 @@ EGLAPI EGLBoolean EGLAPIENTRY eglGetSyncValuesCHROMIUM(EGLDisplay dpy, 
#define EGL_FEATURE_COUNT_ANGLE 0x3465

#define EGL_FEATURE_OVERRIDES_ENABLED_ANGLE 0x3466

#define EGL_FEATURE_OVERRIDES_DISABLED_ANGLE 0x3467

#define EGL_FEATURE_CONDITION_ANGLE 0x3468

#define EGL_FEATURE_ALL_DISABLED_ANGLE 0x3469

typedef const char *(EGLAPIENTRYP PFNEGLQUERYSTRINGIANGLEPROC) (EGLDisplay dpy, EGLint name, EGLint index);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDISPLAYATTRIBANGLEPROC) (EGLDisplay dpy, EGLint attribute, EGLAttrib *value);

#ifdef EGL_EGLEXT_PROTOTYPES
@@ -229,6 +298,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribANGLE(EGLDisplay dpy, EGLint 


#ifndef EGL_ANGLE_image_d3d11_texture

#define EGL_D3D11_TEXTURE_ANGLE 0x3484

#define EGL_TEXTURE_INTERNAL_FORMAT_ANGLE 0x345D

#endif /* EGL_ANGLE_image_d3d11_texture */



#ifndef EGL_ANGLE_create_context_backwards_compatible
@@ -236,6 +306,36 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribANGLE(EGLDisplay dpy, EGLint 
#define EGL_CONTEXT_OPENGL_BACKWARDS_COMPATIBLE_ANGLE 0x3483

#endif /* EGL_ANGLE_create_context_backwards_compatible */



#ifndef EGL_ANGLE_device_cgl

#define EGL_ANGLE_device_cgl 1

#define EGL_CGL_CONTEXT_ANGLE 0x3485

#define EGL_CGL_PIXEL_FORMAT_ANGLE 0x3486

#endif



#ifndef EGL_ANGLE_ggp_stream_descriptor

#define EGL_ANGLE_ggp_stream_descriptor 1

#define EGL_GGP_STREAM_DESCRIPTOR_ANGLE 0x348B

#endif /* EGL_ANGLE_ggp_stream_descriptor */



#ifndef EGL_ANGLE_swap_with_frame_token

#define EGL_ANGLE_swap_with_frame_token 1

typedef khronos_uint64_t EGLFrameTokenANGLE;

typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSWITHFRAMETOKENANGLEPROC)(EGLDisplay dpy, EGLSurface surface, EGLFrameTokenANGLE frametoken);

#ifdef EGL_EGLEXT_PROTOTYPES

EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersWithFrameTokenANGLE(EGLDisplay dpy, EGLSurface surface, EGLFrameTokenANGLE frametoken);

#endif

#endif /* EGL_ANGLE_swap_with_frame_token */



#ifndef EGL_ANGLE_device_eagl

#define EGL_ANGLE_device_eagl 1

#define EGL_EAGL_CONTEXT_ANGLE 0x348C

#endif



#ifndef EGL_ANGLE_display_semaphore_share_group

#define EGL_ANGLE_display_semaphore_share_group 1

#define EGL_DISPLAY_SEMAPHORE_SHARE_GROUP_ANGLE 0x348D

#endif /* EGL_ANGLE_display_semaphore_share_group */



// clang-format on



#endif  // INCLUDE_EGL_EGLEXT_ANGLE_

gfx/angle/checkout/include/EGL/eglplatform.h

+7 −1
Original line number Diff line number Diff line
@@ -110,7 +110,13 @@ typedef void* EGLNativeDisplayType; 
typedef struct egl_native_pixmap_t*     EGLNativePixmapType;

typedef struct ANativeWindow*           EGLNativeWindowType;



#elif defined(USE_OZONE)

#elif defined(USE_OZONE) || defined(USE_SYSTEM_EGL)



typedef intptr_t EGLNativeDisplayType;

typedef intptr_t EGLNativePixmapType;

typedef intptr_t EGLNativeWindowType;



#elif defined(__ggp__)



typedef intptr_t EGLNativeDisplayType;

typedef intptr_t EGLNativePixmapType;