diff options
| author | Geoff Lang <geofflang@chromium.org> | 2024-05-08 10:33:49 -0400 |
|---|---|---|
| committer | Angle LUCI CQ <angle-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2024-05-08 15:49:56 +0000 |
| commit | 071e1e83aebf0ad291e9a87a3db8ce1b050d3e2d (patch) | |
| tree | 55cf170e7fc7b0ed65c0b65941f18dc8a35bbece | |
| parent | 4c66e8a4ffca5b8baf119ec20fa26ee3cc2cf663 (diff) | |
| download | angle-071e1e83aebf0ad291e9a87a3db8ce1b050d3e2d.tar.gz | |
EGL: eglCreateSyncKHR uses a return value for the tail call
eglCreateSyncKHR was duplicated in two lists for using a tail
call and needing a return value tail call.
Bug: angleproject:8434, chromium:338902974
Change-Id: I9dffeaec3468e4ea3f5ed7d885e9ef418e8d8da5
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5525854
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
| -rw-r--r-- | scripts/code_generation_hashes/GL_EGL_entry_points.json | 4 | ||||
| -rwxr-xr-x | scripts/generate_entry_points.py | 9 | ||||
| -rw-r--r-- | src/libGLESv2/entry_points_egl_ext_autogen.cpp | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/scripts/code_generation_hashes/GL_EGL_entry_points.json b/scripts/code_generation_hashes/GL_EGL_entry_points.json index 7a619c02ad..e9a18065a5 100644 --- a/scripts/code_generation_hashes/GL_EGL_entry_points.json +++ b/scripts/code_generation_hashes/GL_EGL_entry_points.json @@ -6,7 +6,7 @@ "scripts/entry_point_packed_gl_enums.json": "57a3a729fd25032bc336f4b6a55bc238", "scripts/generate_entry_points.py": - "359649efbbc776d91eb29bc1d78c737c", + "38b4b32e3837f07361f7d4e9cd4660e8", "scripts/gl_angle_ext.xml": "197e07a917d5bba6dfa2840fb1b58e7e", "scripts/registry_xml.py": @@ -134,7 +134,7 @@ "src/libGLESv2/entry_points_egl_autogen.h": "3bc7a8df9deadd7cfd615d0cfad0c6a8", "src/libGLESv2/entry_points_egl_ext_autogen.cpp": - "0409df0bdbbc0fb32a88d5f23a2cb7a5", + "3e2adc28a98fc5c23f13255e31e589c1", "src/libGLESv2/entry_points_egl_ext_autogen.h": "2d005f4cb16dcdd61e08cfec97a12f86", "src/libGLESv2/entry_points_gl_1_autogen.cpp": diff --git a/scripts/generate_entry_points.py b/scripts/generate_entry_points.py index 31f54940e7..47dbb4ae94 100755 --- a/scripts/generate_entry_points.py +++ b/scripts/generate_entry_points.py @@ -3129,11 +3129,10 @@ def get_unlocked_tail_call(api, cmd_name): # native EGL function in tail call # if (cmd_name in [ - 'eglCreateSyncKHR', 'eglDestroySurface', 'eglMakeCurrent', 'eglReleaseThread', - 'eglCreateWindowSurface', 'eglCreatePlatformWindowSurface', - 'eglCreatePlatformWindowSurfaceEXT', 'eglPrepareSwapBuffersANGLE', - 'eglSwapBuffersWithFrameTokenANGLE', 'glFinishFenceNV', 'glCompileShader', - 'glLinkProgram' + 'eglDestroySurface', 'eglMakeCurrent', 'eglReleaseThread', 'eglCreateWindowSurface', + 'eglCreatePlatformWindowSurface', 'eglCreatePlatformWindowSurfaceEXT', + 'eglPrepareSwapBuffersANGLE', 'eglSwapBuffersWithFrameTokenANGLE', 'glFinishFenceNV', + 'glCompileShader', 'glLinkProgram' ] or cmd_name.startswith('glTexImage2D') or cmd_name.startswith('glTexImage3D') or cmd_name.startswith('glTexSubImage2D') or cmd_name.startswith('glTexSubImage3D') or cmd_name.startswith('glCompressedTexImage2D') or diff --git a/src/libGLESv2/entry_points_egl_ext_autogen.cpp b/src/libGLESv2/entry_points_egl_ext_autogen.cpp index 405f138781..939cf04184 100644 --- a/src/libGLESv2/entry_points_egl_ext_autogen.cpp +++ b/src/libGLESv2/entry_points_egl_ext_autogen.cpp @@ -1451,7 +1451,7 @@ EGLSyncKHR EGLAPIENTRY EGL_CreateSyncKHR(EGLDisplay dpy, EGLenum type, const EGL ANGLE_CAPTURE_EGL(CreateSyncKHR, true, thread, dpyPacked, type, attrib_listPacked, returnValue); } - egl::Display::GetCurrentThreadUnlockedTailCall()->run(nullptr); + egl::Display::GetCurrentThreadUnlockedTailCall()->run(&returnValue); return returnValue; } |