Skip to content

A
angle
Commit 23d4b64a by Jamie Madill Committed by Commit Bot
Options

EGL: Auto-generate Windows .def file.

Several entry points were missing from the .def file. The auto- generation ensures we remain consistent. Bug: angleproject:2621 Change-Id: Icb4089c4235f43e76ebd588216d4b988e3a2f0f3 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2552775 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Reviewed-by: 's avatarTim Van Patten <timvp@google.com>
parent 0a5bc0ce
Showing with 183 additions and 97 deletions
BUILD.gn
...@@ -1048,7 +1048,7 @@ angle_shared_library("libEGL") { ...@@ -1048,7 +1048,7 @@ angle_shared_library("libEGL") {
} }
if (is_win) { if (is_win) {
sources += [ "src/libEGL/libEGL.def" ] sources += [ "src/libEGL/libEGL_autogen.def" ]
} }
deps = [ deps = [
......
scripts/code_generation_hashes/GL_EGL_entry_points.json
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"scripts/entry_point_packed_gl_enums.json": "scripts/entry_point_packed_gl_enums.json":
"846be5dc8cb36076207699b025633fcc", "846be5dc8cb36076207699b025633fcc",
"scripts/generate_entry_points.py": "scripts/generate_entry_points.py":
"06fac560bdbe1a51d7a5d0b5985dc894", "4fa24b51c640b48c203924e5af331f44",
"scripts/gl.xml": "scripts/gl.xml":
"f66967f3f3d696b5d8306fd80bbd49a8", "f66967f3f3d696b5d8306fd80bbd49a8",
"scripts/gl_angle_ext.xml": "scripts/gl_angle_ext.xml":
...@@ -155,6 +155,8 @@ ...@@ -155,6 +155,8 @@
"cbe3f917024a93a3adcbd2806f3e951f", "cbe3f917024a93a3adcbd2806f3e951f",
"src/libEGL/libEGL_autogen.cpp": "src/libEGL/libEGL_autogen.cpp":
"e6a94332f3bbea212b9a5df9654b59f8", "e6a94332f3bbea212b9a5df9654b59f8",
"src/libEGL/libEGL_autogen.def":
"3f504d6280dc1d847bc2dedc51fa2640",
"src/libGL/entry_points_gl_1_0_autogen.cpp": "src/libGL/entry_points_gl_1_0_autogen.cpp":
"cb974a5a4230f15b0de83a3f690dc481", "cb974a5a4230f15b0de83a3f690dc481",
"src/libGL/entry_points_gl_1_0_autogen.h": "src/libGL/entry_points_gl_1_0_autogen.h":
......
scripts/generate_entry_points.py
...@@ -2008,6 +2008,7 @@ def main(): ...@@ -2008,6 +2008,7 @@ def main():
'../src/libANGLE/validationGL45_autogen.h', '../src/libANGLE/validationGL45_autogen.h',
'../src/libANGLE/validationGL46_autogen.h', '../src/libANGLE/validationGL46_autogen.h',
'../src/libEGL/libEGL_autogen.cpp', '../src/libEGL/libEGL_autogen.cpp',
'../src/libEGL/libEGL_autogen.def',
'../src/libGLESv2/entry_points_egl_autogen.h', '../src/libGLESv2/entry_points_egl_autogen.h',
'../src/libGLESv2/entry_points_egl_ext_autogen.h', '../src/libGLESv2/entry_points_egl_ext_autogen.h',
'../src/libGLESv2/entry_points_gles_1_0_autogen.cpp', '../src/libGLESv2/entry_points_gles_1_0_autogen.cpp',
...@@ -2363,6 +2364,7 @@ def main(): ...@@ -2363,6 +2364,7 @@ def main():
egl_decls = [] egl_decls = []
egl_defs = [] egl_defs = []
libegl_ep_defs = [] libegl_ep_defs = []
libegl_windows_def_exports = []
for major_version, minor_version in [[1, 0], [1, 1], [1, 2], [1, 3], [1, 4], [1, 5]]: for major_version, minor_version in [[1, 0], [1, 1], [1, 2], [1, 3], [1, 4], [1, 5]]:
version = "%d_%d" % (major_version, minor_version) version = "%d_%d" % (major_version, minor_version)
...@@ -2385,11 +2387,13 @@ def main(): ...@@ -2385,11 +2387,13 @@ def main():
cmd_packed_egl_enums, EGL_PACKED_TYPES) cmd_packed_egl_enums, EGL_PACKED_TYPES)
comment = "\n// EGL %d.%d" % (major_version, minor_version) comment = "\n// EGL %d.%d" % (major_version, minor_version)
win_def_comment = "\n ; EGL %d.%d" % (major_version, minor_version)
egl_validation_protos += [comment] + validation_protos egl_validation_protos += [comment] + validation_protos
egl_decls += [comment] + decls egl_decls += [comment] + decls
egl_defs += [comment] + defs egl_defs += [comment] + defs
libegl_ep_defs += [comment] + export_defs libegl_ep_defs += [comment] + export_defs
libegl_windows_def_exports += [win_def_comment] + get_exports(eglxml.commands[version])
write_file("egl", "EGL", TEMPLATE_ENTRY_POINT_HEADER, "\n".join(egl_decls), "h", write_file("egl", "EGL", TEMPLATE_ENTRY_POINT_HEADER, "\n".join(egl_decls), "h",
EGL_HEADER_INCLUDES, "libGLESv2", "egl.xml", "extern \"C\"") EGL_HEADER_INCLUDES, "libGLESv2", "egl.xml", "extern \"C\"")
...@@ -2415,11 +2419,13 @@ def main(): ...@@ -2415,11 +2419,13 @@ def main():
defs.append(msg) defs.append(msg)
comment = "\n// %s" % extension_name comment = "\n// %s" % extension_name
win_def_comment = "\n ; %s" % (extension_name)
egl_validation_protos += [comment] + validation_protos egl_validation_protos += [comment] + validation_protos
egl_ext_decls += [comment] + decls egl_ext_decls += [comment] + decls
egl_ext_defs += [comment] + defs egl_ext_defs += [comment] + defs
libegl_ep_defs += [comment] + export_defs libegl_ep_defs += [comment] + export_defs
libegl_windows_def_exports += [win_def_comment] + get_exports(ext_cmd_names)
write_file("egl_ext", "EGL Extension", TEMPLATE_ENTRY_POINT_HEADER, "\n".join(egl_ext_decls), write_file("egl_ext", "EGL Extension", TEMPLATE_ENTRY_POINT_HEADER, "\n".join(egl_ext_decls),
"h", EGL_EXT_HEADER_INCLUDES, "libGLESv2", "egl.xml and egl_angle_ext.xml", "h", EGL_EXT_HEADER_INCLUDES, "libGLESv2", "egl.xml and egl_angle_ext.xml",
...@@ -2541,6 +2547,8 @@ def main(): ...@@ -2541,6 +2547,8 @@ def main():
for lib in ["libGLESv2" + suffix for suffix in ["", "_no_capture", "_with_capture"]]: for lib in ["libGLESv2" + suffix for suffix in ["", "_no_capture", "_with_capture"]]:
write_windows_def_file(everything, lib, lib, "libGLESv2", libgles_ep_exports) write_windows_def_file(everything, lib, lib, "libGLESv2", libgles_ep_exports)
write_windows_def_file(everything, "libGL", "openGL32", "libGL", libgl_ep_exports) write_windows_def_file(everything, "libGL", "openGL32", "libGL", libgl_ep_exports)
write_windows_def_file("egl.xml and egl_angle_ext.xml", "libEGL", "libEGL", "libEGL",
libegl_windows_def_exports)
all_gles_param_types = sorted(all_gles_param_types) all_gles_param_types = sorted(all_gles_param_types)
write_capture_helper_header(all_gles_param_types) write_capture_helper_header(all_gles_param_types)
......
src/libEGL/libEGL.def deleted 100644 → 0
LIBRARY libEGL
EXPORTS
eglBindAPI @14
eglBindTexImage @20
eglChooseConfig @7
eglCopyBuffers @33
eglCreateContext @23
eglCreatePbufferFromClientBuffer @18
eglCreatePbufferSurface @10
eglCreatePixmapSurface @11
eglCreateWindowSurface @9
eglDestroyContext @24
eglDestroySurface @12
eglGetConfigAttrib @8
eglGetConfigs @6
eglGetCurrentContext @26
eglGetCurrentDisplay @28
eglGetCurrentSurface @27
eglGetDisplay @2
eglGetError @1
eglGetProcAddress @34
eglInitialize @3
eglMakeCurrent @25
eglQueryAPI @15
eglQueryContext @29
eglQueryString @5
eglQuerySurface @13
eglReleaseTexImage @21
eglReleaseThread @17
eglSurfaceAttrib @19
eglSwapBuffers @32
eglSwapInterval @22
eglTerminate @4
eglWaitClient @16
eglWaitGL @30
eglWaitNative @31
; Extensions
eglGetPlatformDisplayEXT @35
eglQuerySurfacePointerANGLE @36
eglPostSubBufferNV @37
eglQueryDisplayAttribEXT @48
eglQueryDeviceAttribEXT @49
eglQueryDeviceStringEXT @50
eglCreateImageKHR @51
eglDestroyImageKHR @52
eglCreateDeviceANGLE @53
eglReleaseDeviceANGLE @54
eglCreateStreamKHR @55
eglDestroyStreamKHR @56
eglStreamAttribKHR @57
eglQueryStreamKHR @58
eglQueryStreamu64KHR @59
eglStreamConsumerGLTextureExternalKHR @60
eglStreamConsumerAcquireKHR @61
eglStreamConsumerReleaseKHR @62
eglStreamConsumerGLTextureExternalAttribsNV @63
eglCreateStreamProducerD3DTextureANGLE @64
eglStreamPostD3DTextureANGLE @65
eglGetSyncValuesCHROMIUM @66
eglSwapBuffersWithDamageKHR @67
eglProgramCacheGetAttribANGLE @68
eglProgramCachePopulateANGLE @69
eglProgramCacheQueryANGLE @70
eglProgramCacheResizeANGLE @71
eglCreatePlatformWindowSurfaceEXT @72
eglCreatePlatformPixmapSurfaceEXT @73
eglPresentationTimeANDROID @74
eglDebugMessageControlKHR @75
eglQueryDebugKHR @76
eglLabelObjectKHR @77
eglSetBlobCacheFuncsANDROID @78
eglQueryDisplayAttribANGLE @79
eglQueryStringiANGLE @80
eglGetNativeClientBufferANDROID @81
eglDupNativeFenceFDANDROID @82
eglGetMscRateANGLE @83
eglCreateSyncKHR @84
eglDestroySyncKHR @85
eglClientWaitSyncKHR @86
eglGetSyncAttribKHR @87
eglWaitSyncKHR @88
eglSignalSyncKHR @89
; 1.5 entry points
eglCreateSync @38
eglDestroySync @39
eglClientWaitSync @40
eglGetSyncAttrib @41
eglCreateImage @42
eglDestroyImage @43
eglGetPlatformDisplay @44
eglCreatePlatformWindowSurface @45
eglCreatePlatformPixmapSurface @46
eglWaitSync @47
src/libEGL/libEGL_autogen.def 0 → 100644
; GENERATED FILE - DO NOT EDIT.
; Generated by generate_entry_points.py using data from egl.xml and egl_angle_ext.xml.
;
; Copyright 2020 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.
LIBRARY libEGL
EXPORTS
; EGL 1.0
eglChooseConfig
eglCopyBuffers
eglCreateContext
eglCreatePbufferSurface
eglCreatePixmapSurface
eglCreateWindowSurface
eglDestroyContext
eglDestroySurface
eglGetConfigAttrib
eglGetConfigs
eglGetCurrentDisplay
eglGetCurrentSurface
eglGetDisplay
eglGetError
eglGetProcAddress
eglInitialize
eglMakeCurrent
eglQueryContext
eglQueryString
eglQuerySurface
eglSwapBuffers
eglTerminate
eglWaitGL
eglWaitNative
; EGL 1.1
eglBindTexImage
eglReleaseTexImage
eglSurfaceAttrib
eglSwapInterval
; EGL 1.2
eglBindAPI
eglCreatePbufferFromClientBuffer
eglQueryAPI
eglReleaseThread
eglWaitClient
; EGL 1.4
eglGetCurrentContext
; EGL 1.5
eglClientWaitSync
eglCreateImage
eglCreatePlatformPixmapSurface
eglCreatePlatformWindowSurface
eglCreateSync
eglDestroyImage
eglDestroySync
eglGetPlatformDisplay
eglGetSyncAttrib
eglWaitSync
; EGL_ANDROID_blob_cache
eglSetBlobCacheFuncsANDROID
; EGL_ANDROID_create_native_client_buffer
eglCreateNativeClientBufferANDROID
; EGL_ANDROID_get_frame_timestamps
eglGetCompositorTimingANDROID
eglGetCompositorTimingSupportedANDROID
eglGetFrameTimestampSupportedANDROID
eglGetFrameTimestampsANDROID
eglGetNextFrameIdANDROID
; EGL_ANDROID_get_native_client_buffer
eglGetNativeClientBufferANDROID
; EGL_ANDROID_native_fence_sync
eglDupNativeFenceFDANDROID
; EGL_ANDROID_presentation_time
eglPresentationTimeANDROID
; EGL_ANGLE_device_creation
eglCreateDeviceANGLE
eglReleaseDeviceANGLE
; EGL_ANGLE_feature_control
eglQueryDisplayAttribANGLE
eglQueryStringiANGLE
; EGL_ANGLE_power_preference
eglHandleGPUSwitchANGLE
eglReacquireHighPowerGPUANGLE
eglReleaseHighPowerGPUANGLE
; EGL_ANGLE_program_cache_control
eglProgramCacheGetAttribANGLE
eglProgramCachePopulateANGLE
eglProgramCacheQueryANGLE
eglProgramCacheResizeANGLE
; EGL_ANGLE_query_surface_pointer
eglQuerySurfacePointerANGLE
; EGL_ANGLE_stream_producer_d3d_texture
eglCreateStreamProducerD3DTextureANGLE
eglStreamPostD3DTextureANGLE
; EGL_ANGLE_swap_with_frame_token
eglSwapBuffersWithFrameTokenANGLE
; EGL_ANGLE_sync_control_rate
eglGetMscRateANGLE
; EGL_CHROMIUM_sync_control
eglGetSyncValuesCHROMIUM
; EGL_EXT_device_query
eglQueryDeviceAttribEXT
eglQueryDeviceStringEXT
eglQueryDisplayAttribEXT
; EGL_EXT_platform_base
eglCreatePlatformPixmapSurfaceEXT
eglCreatePlatformWindowSurfaceEXT
eglGetPlatformDisplayEXT
; EGL_KHR_debug
eglDebugMessageControlKHR
eglLabelObjectKHR
eglQueryDebugKHR
; EGL_KHR_fence_sync
eglClientWaitSyncKHR
eglCreateSyncKHR
eglDestroySyncKHR
eglGetSyncAttribKHR
; EGL_KHR_image
eglCreateImageKHR
eglDestroyImageKHR
; EGL_KHR_reusable_sync
eglSignalSyncKHR
; EGL_KHR_stream
eglCreateStreamKHR
eglDestroyStreamKHR
eglQueryStreamKHR
eglQueryStreamu64KHR
eglStreamAttribKHR
; EGL_KHR_stream_consumer_gltexture
eglStreamConsumerAcquireKHR
eglStreamConsumerGLTextureExternalKHR
eglStreamConsumerReleaseKHR
; EGL_KHR_swap_buffers_with_damage
eglSwapBuffersWithDamageKHR
; EGL_KHR_wait_sync
eglWaitSyncKHR
; EGL_NV_post_sub_buffer
eglPostSubBufferNV
; EGL_NV_stream_consumer_gltexture_yuv
eglStreamConsumerGLTextureExternalAttribsNV
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment