Skip to content

A
angle
Commit 8eaf72a8 by Jeff Vigil Committed by Commit Bot
Options

EGL: Entrypoint and autogen for EGL_KHR_reusable_sync

Add entry point eglSignalSync Update autogen files Test: angle_deqp_egl_tests --deqp-case=dEQP-EGL.functional.reusable_sync.* Bug: angleproject:5168 Change-Id: I47afa4010c533096b4c56e9b3ab6eddc1944b83e Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2472998 Commit-Queue: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jeff Vigil <j.vigil@samsung.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarShahbaz Youssefi <syoussefi@chromium.org>
parent f51e99fb
Showing with 64 additions and 15 deletions
scripts/code_generation_hashes/GL_EGL_WGL_loader.json
......@@ -10,25 +10,25 @@
"scripts/gl_angle_ext.xml":
"5b91263f1099308e4e75f89d85be564e",
"scripts/registry_xml.py":
"4da28e17daa27ea8b2133a34f74b4770",
"be6845c1acc237fad43d05ef60b3111f",
"scripts/wgl.xml":
"c36001431919e1c435f1215a85f7e1db",
"src/libEGL/egl_loader_autogen.cpp":
"419041385faafafc4299cd6b5b8da642",
"5948ab696aadacda679840af8f16dbe3",
"src/libEGL/egl_loader_autogen.h":
"01035f491f6692446c882504c3d20792",
"fcf59fce6301d6396eec2100706e50a0",
"src/tests/restricted_traces/trace_egl_loader_autogen.cpp":
"929f135ba9ba7717e76552c9e76f0f2f",
"f3a486f33c29e2494bced0f5492fdfe5",
"src/tests/restricted_traces/trace_egl_loader_autogen.h":
"af2eb06cc8de3456b7bfde497b04c0c4",
"412e534d183cf5568cee182edae34511",
"src/tests/restricted_traces/trace_gles_loader_autogen.cpp":
"c42bacdfc41fd407185738fcd50d143c",
"src/tests/restricted_traces/trace_gles_loader_autogen.h":
"3baad319744a76ec8f3d913e79c33cd2",
"util/egl_loader_autogen.cpp":
"e10da66fdf789e6c52dee1f9e1cd5a68",
"5898c23071036a307cfa74a82aeaefb3",
"util/egl_loader_autogen.h":
"5e2ac71185c91139c6768adf8615b3c7",
"f9087796b885ba3874a449ee5155f958",
"util/gles_loader_autogen.cpp":
"ac01450c91f5b4a6ad0ef9855443ff1a",
"util/gles_loader_autogen.h":
......
scripts/code_generation_hashes/GL_EGL_entry_points.json
......@@ -12,7 +12,7 @@
"scripts/gl_angle_ext.xml":
"5b91263f1099308e4e75f89d85be564e",
"scripts/registry_xml.py":
"4da28e17daa27ea8b2133a34f74b4770",
"be6845c1acc237fad43d05ef60b3111f",
"scripts/wgl.xml":
"c36001431919e1c435f1215a85f7e1db",
"src/common/entry_points_enum_autogen.cpp":
......@@ -256,9 +256,9 @@
"src/libGLESv2/libGLESv2_autogen.cpp":
"a0426ec7762692c90a252d8760b4ac97",
"src/libGLESv2/libGLESv2_autogen.def":
"8498506503fa4d8bfa2b5ad417f83b46",
"bbd345e4cdac3e4d049ee65b4a45e05a",
"src/libGLESv2/libGLESv2_no_capture_autogen.def":
"0dd61385441c98d913c73998ab2fc8ad",
"bcd0cd5127fe01818f9fe7a9504c7bed",
"src/libGLESv2/libGLESv2_with_capture_autogen.def":
"1f2d4e16495ab07198c1c9fb288d18fd"
"4f1a86fa379b119500d4e6529b24c7d4"
}
\ No newline at end of file
scripts/code_generation_hashes/GLenum_value_to_string_map.json
......@@ -6,7 +6,7 @@
"scripts/gl_angle_ext.xml":
"5b91263f1099308e4e75f89d85be564e",
"scripts/registry_xml.py":
"4da28e17daa27ea8b2133a34f74b4770",
"be6845c1acc237fad43d05ef60b3111f",
"src/libANGLE/gl_enum_utils_autogen.cpp":
"823b9cac0022281ac7ea5aa7b23a3a66",
"src/libANGLE/gl_enum_utils_autogen.h":
......
scripts/code_generation_hashes/proc_table.json
......@@ -10,11 +10,11 @@
"scripts/gl_angle_ext.xml":
"5b91263f1099308e4e75f89d85be564e",
"scripts/registry_xml.py":
"4da28e17daa27ea8b2133a34f74b4770",
"be6845c1acc237fad43d05ef60b3111f",
"scripts/wgl.xml":
"c36001431919e1c435f1215a85f7e1db",
"src/libGL/proc_table_wgl_autogen.cpp":
"253f59ef3aa9ccfcab1364ae5101dbe2",
"src/libGLESv2/proc_table_egl_autogen.cpp":
"ad1495916d7976685bcd468b37dbe090"
"5ab4c3814801e93f11d34386db74300a"
}
\ No newline at end of file
scripts/registry_xml.py
......@@ -164,6 +164,7 @@ supported_egl_extensions = [
"EGL_EXT_gl_colorspace_scrgb_linear",
"EGL_KHR_image",
"EGL_KHR_no_config_context",
"EGL_KHR_reusable_sync",
"EGL_KHR_stream",
"EGL_KHR_stream_consumer_gltexture",
"EGL_KHR_surfaceless_context",
......
src/libEGL/egl_loader_autogen.cpp
......@@ -96,6 +96,7 @@ PFNEGLDESTROYSYNCKHRPROC l_EGL_DestroySyncKHR;
PFNEGLGETSYNCATTRIBKHRPROC l_EGL_GetSyncAttribKHR;
PFNEGLCREATEIMAGEKHRPROC l_EGL_CreateImageKHR;
PFNEGLDESTROYIMAGEKHRPROC l_EGL_DestroyImageKHR;
PFNEGLSIGNALSYNCKHRPROC l_EGL_SignalSyncKHR;
PFNEGLCREATESTREAMKHRPROC l_EGL_CreateStreamKHR;
PFNEGLDESTROYSTREAMKHRPROC l_EGL_DestroyStreamKHR;
PFNEGLQUERYSTREAMKHRPROC l_EGL_QueryStreamKHR;
......@@ -262,6 +263,7 @@ void LoadEGL_EGL(LoadProc loadProc)
reinterpret_cast<PFNEGLCREATEIMAGEKHRPROC>(loadProc("EGL_CreateImageKHR"));
l_EGL_DestroyImageKHR =
reinterpret_cast<PFNEGLDESTROYIMAGEKHRPROC>(loadProc("EGL_DestroyImageKHR"));
l_EGL_SignalSyncKHR = reinterpret_cast<PFNEGLSIGNALSYNCKHRPROC>(loadProc("EGL_SignalSyncKHR"));
l_EGL_CreateStreamKHR =
reinterpret_cast<PFNEGLCREATESTREAMKHRPROC>(loadProc("EGL_CreateStreamKHR"));
l_EGL_DestroyStreamKHR =
......
src/libEGL/egl_loader_autogen.h
......@@ -101,6 +101,7 @@
#define EGL_GetSyncAttribKHR l_EGL_GetSyncAttribKHR
#define EGL_CreateImageKHR l_EGL_CreateImageKHR
#define EGL_DestroyImageKHR l_EGL_DestroyImageKHR
#define EGL_SignalSyncKHR l_EGL_SignalSyncKHR
#define EGL_CreateStreamKHR l_EGL_CreateStreamKHR
#define EGL_DestroyStreamKHR l_EGL_DestroyStreamKHR
#define EGL_QueryStreamKHR l_EGL_QueryStreamKHR
......@@ -206,6 +207,7 @@ ANGLE_NO_EXPORT extern PFNEGLDESTROYSYNCKHRPROC l_EGL_DestroySyncKHR;
ANGLE_NO_EXPORT extern PFNEGLGETSYNCATTRIBKHRPROC l_EGL_GetSyncAttribKHR;
ANGLE_NO_EXPORT extern PFNEGLCREATEIMAGEKHRPROC l_EGL_CreateImageKHR;
ANGLE_NO_EXPORT extern PFNEGLDESTROYIMAGEKHRPROC l_EGL_DestroyImageKHR;
ANGLE_NO_EXPORT extern PFNEGLSIGNALSYNCKHRPROC l_EGL_SignalSyncKHR;
ANGLE_NO_EXPORT extern PFNEGLCREATESTREAMKHRPROC l_EGL_CreateStreamKHR;
ANGLE_NO_EXPORT extern PFNEGLDESTROYSTREAMKHRPROC l_EGL_DestroyStreamKHR;
ANGLE_NO_EXPORT extern PFNEGLQUERYSTREAMKHRPROC l_EGL_QueryStreamKHR;
......
src/libEGL/libEGL.cpp
......@@ -768,4 +768,10 @@ EGLint EGLAPIENTRY eglWaitSyncKHR(EGLDisplay dpy, EGLSync sync, EGLint flags)
return EGL_WaitSyncKHR(dpy, sync, flags);
}
EGLBoolean EGLAPIENTRY eglSignalSyncKHR(EGLDisplay dpy, EGLSync sync, EGLenum mode)
{
EnsureEGLLoaded();
return EGL_SignalSyncKHR(dpy, sync, mode);
}
} // extern "C"
src/libEGL/libEGL.def
......@@ -80,6 +80,7 @@ EXPORTS
eglClientWaitSyncKHR @86
eglGetSyncAttribKHR @87
eglWaitSyncKHR @88
eglSignalSyncKHR @89
; 1.5 entry points
eglCreateSync @38
......
src/libGLESv2/entry_points_egl_ext.cpp
......@@ -1638,4 +1638,18 @@ void EGLAPIENTRY EGL_HandleGPUSwitchANGLE(EGLDisplay dpy)
thread->setSuccess();
}
// EGL_KHR_reusable_sync
ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_SignalSyncKHR(EGLDisplay dpy, EGLSync sync, EGLenum mode)
{
ANGLE_SCOPED_GLOBAL_LOCK();
FUNC_EVENT("EGLDisplay dpy = 0x%016" PRIxPTR ", EGLSync sync = 0x%016" PRIxPTR
", EGLint mode = 0x%X",
(uintptr_t)dpy, (uintptr_t)sync, mode);
Thread *thread = egl::GetCurrentThread();
// Unimplemented.
thread->setSuccess();
return EGL_TRUE;
}
} // extern "C"
src/libGLESv2/entry_points_egl_ext.h
......@@ -240,6 +240,9 @@ ANGLE_EXPORT void EGLAPIENTRY EGL_ReacquireHighPowerGPUANGLE(EGLDisplay dpy, EGL
ANGLE_EXPORT void EGLAPIENTRY EGL_HandleGPUSwitchANGLE(EGLDisplay dpy);
// EGL_KHR_reusable_sync
ANGLE_EXPORT EGLBoolean EGLAPIENTRY EGL_SignalSyncKHR(EGLDisplay dpy, EGLSync sync, EGLenum mode);
} // extern "C"
#endif // LIBGLESV2_ENTRYPOINTSEGLEXT_H_
src/libGLESv2/libGLESv2_autogen.def
......@@ -1759,6 +1759,9 @@ EXPORTS
EGL_CreateImageKHR
EGL_DestroyImageKHR
; EGL_KHR_reusable_sync
EGL_SignalSyncKHR
; EGL_KHR_stream
EGL_CreateStreamKHR
EGL_DestroyStreamKHR
......
src/libGLESv2/libGLESv2_no_capture_autogen.def
......@@ -1759,6 +1759,9 @@ EXPORTS
EGL_CreateImageKHR
EGL_DestroyImageKHR
; EGL_KHR_reusable_sync
EGL_SignalSyncKHR
; EGL_KHR_stream
EGL_CreateStreamKHR
EGL_DestroyStreamKHR
......
src/libGLESv2/libGLESv2_with_capture_autogen.def
......@@ -1759,6 +1759,9 @@ EXPORTS
EGL_CreateImageKHR
EGL_DestroyImageKHR
; EGL_KHR_reusable_sync
EGL_SignalSyncKHR
; EGL_KHR_stream
EGL_CreateStreamKHR
EGL_DestroyStreamKHR
......
src/libGLESv2/proc_table_egl_autogen.cpp
......@@ -110,6 +110,7 @@ const ProcEntry g_procTable[] = {
{"eglReleaseTexImage", P(EGL_ReleaseTexImage)},
{"eglReleaseThread", P(EGL_ReleaseThread)},
{"eglSetBlobCacheFuncsANDROID", P(EGL_SetBlobCacheFuncsANDROID)},
{"eglSignalSyncKHR", P(EGL_SignalSyncKHR)},
{"eglStreamAttribKHR", P(EGL_StreamAttribKHR)},
{"eglStreamConsumerAcquireKHR", P(EGL_StreamConsumerAcquireKHR)},
{"eglStreamConsumerGLTextureExternalAttribsNV",
......@@ -1635,5 +1636,5 @@ const ProcEntry g_procTable[] = {
{"glWeightPointerOES", P(gl::WeightPointerOES)},
{"glWeightPointerOESContextANGLE", P(gl::WeightPointerOESContextANGLE)}};
const size_t g_numProcs = 1538;
const size_t g_numProcs = 1539;
} // namespace egl
src/tests/restricted_traces/trace_egl_loader_autogen.cpp
......@@ -99,6 +99,7 @@ ANGLE_TRACE_EXPORT PFNEGLDESTROYSYNCKHRPROC t_eglDestroySyncKHR;
ANGLE_TRACE_EXPORT PFNEGLGETSYNCATTRIBKHRPROC t_eglGetSyncAttribKHR;
ANGLE_TRACE_EXPORT PFNEGLCREATEIMAGEKHRPROC t_eglCreateImageKHR;
ANGLE_TRACE_EXPORT PFNEGLDESTROYIMAGEKHRPROC t_eglDestroyImageKHR;
ANGLE_TRACE_EXPORT PFNEGLSIGNALSYNCKHRPROC t_eglSignalSyncKHR;
ANGLE_TRACE_EXPORT PFNEGLCREATESTREAMKHRPROC t_eglCreateStreamKHR;
ANGLE_TRACE_EXPORT PFNEGLDESTROYSTREAMKHRPROC t_eglDestroyStreamKHR;
ANGLE_TRACE_EXPORT PFNEGLQUERYSTREAMKHRPROC t_eglQueryStreamKHR;
......@@ -260,6 +261,7 @@ void LoadEGL(LoadProc loadProc)
t_eglCreateImageKHR = reinterpret_cast<PFNEGLCREATEIMAGEKHRPROC>(loadProc("eglCreateImageKHR"));
t_eglDestroyImageKHR =
reinterpret_cast<PFNEGLDESTROYIMAGEKHRPROC>(loadProc("eglDestroyImageKHR"));
t_eglSignalSyncKHR = reinterpret_cast<PFNEGLSIGNALSYNCKHRPROC>(loadProc("eglSignalSyncKHR"));
t_eglCreateStreamKHR =
reinterpret_cast<PFNEGLCREATESTREAMKHRPROC>(loadProc("eglCreateStreamKHR"));
t_eglDestroyStreamKHR =
......
src/tests/restricted_traces/trace_egl_loader_autogen.h
......@@ -102,6 +102,7 @@
#define eglGetSyncAttribKHR t_eglGetSyncAttribKHR
#define eglCreateImageKHR t_eglCreateImageKHR
#define eglDestroyImageKHR t_eglDestroyImageKHR
#define eglSignalSyncKHR t_eglSignalSyncKHR
#define eglCreateStreamKHR t_eglCreateStreamKHR
#define eglDestroyStreamKHR t_eglDestroyStreamKHR
#define eglQueryStreamKHR t_eglQueryStreamKHR
......@@ -208,6 +209,7 @@ ANGLE_TRACE_EXPORT extern PFNEGLDESTROYSYNCKHRPROC t_eglDestroySyncKHR;
ANGLE_TRACE_EXPORT extern PFNEGLGETSYNCATTRIBKHRPROC t_eglGetSyncAttribKHR;
ANGLE_TRACE_EXPORT extern PFNEGLCREATEIMAGEKHRPROC t_eglCreateImageKHR;
ANGLE_TRACE_EXPORT extern PFNEGLDESTROYIMAGEKHRPROC t_eglDestroyImageKHR;
ANGLE_TRACE_EXPORT extern PFNEGLSIGNALSYNCKHRPROC t_eglSignalSyncKHR;
ANGLE_TRACE_EXPORT extern PFNEGLCREATESTREAMKHRPROC t_eglCreateStreamKHR;
ANGLE_TRACE_EXPORT extern PFNEGLDESTROYSTREAMKHRPROC t_eglDestroyStreamKHR;
ANGLE_TRACE_EXPORT extern PFNEGLQUERYSTREAMKHRPROC t_eglQueryStreamKHR;
......
util/egl_loader_autogen.cpp
......@@ -99,6 +99,7 @@ ANGLE_UTIL_EXPORT PFNEGLDESTROYSYNCKHRPROC l_eglDestroySyncKHR;
ANGLE_UTIL_EXPORT PFNEGLGETSYNCATTRIBKHRPROC l_eglGetSyncAttribKHR;
ANGLE_UTIL_EXPORT PFNEGLCREATEIMAGEKHRPROC l_eglCreateImageKHR;
ANGLE_UTIL_EXPORT PFNEGLDESTROYIMAGEKHRPROC l_eglDestroyImageKHR;
ANGLE_UTIL_EXPORT PFNEGLSIGNALSYNCKHRPROC l_eglSignalSyncKHR;
ANGLE_UTIL_EXPORT PFNEGLCREATESTREAMKHRPROC l_eglCreateStreamKHR;
ANGLE_UTIL_EXPORT PFNEGLDESTROYSTREAMKHRPROC l_eglDestroyStreamKHR;
ANGLE_UTIL_EXPORT PFNEGLQUERYSTREAMKHRPROC l_eglQueryStreamKHR;
......@@ -260,6 +261,7 @@ void LoadEGL(LoadProc loadProc)
l_eglCreateImageKHR = reinterpret_cast<PFNEGLCREATEIMAGEKHRPROC>(loadProc("eglCreateImageKHR"));
l_eglDestroyImageKHR =
reinterpret_cast<PFNEGLDESTROYIMAGEKHRPROC>(loadProc("eglDestroyImageKHR"));
l_eglSignalSyncKHR = reinterpret_cast<PFNEGLSIGNALSYNCKHRPROC>(loadProc("eglSignalSyncKHR"));
l_eglCreateStreamKHR =
reinterpret_cast<PFNEGLCREATESTREAMKHRPROC>(loadProc("eglCreateStreamKHR"));
l_eglDestroyStreamKHR =
......
util/egl_loader_autogen.h
......@@ -102,6 +102,7 @@
#define eglGetSyncAttribKHR l_eglGetSyncAttribKHR
#define eglCreateImageKHR l_eglCreateImageKHR
#define eglDestroyImageKHR l_eglDestroyImageKHR
#define eglSignalSyncKHR l_eglSignalSyncKHR
#define eglCreateStreamKHR l_eglCreateStreamKHR
#define eglDestroyStreamKHR l_eglDestroyStreamKHR
#define eglQueryStreamKHR l_eglQueryStreamKHR
......@@ -207,6 +208,7 @@ ANGLE_UTIL_EXPORT extern PFNEGLDESTROYSYNCKHRPROC l_eglDestroySyncKHR;
ANGLE_UTIL_EXPORT extern PFNEGLGETSYNCATTRIBKHRPROC l_eglGetSyncAttribKHR;
ANGLE_UTIL_EXPORT extern PFNEGLCREATEIMAGEKHRPROC l_eglCreateImageKHR;
ANGLE_UTIL_EXPORT extern PFNEGLDESTROYIMAGEKHRPROC l_eglDestroyImageKHR;
ANGLE_UTIL_EXPORT extern PFNEGLSIGNALSYNCKHRPROC l_eglSignalSyncKHR;
ANGLE_UTIL_EXPORT extern PFNEGLCREATESTREAMKHRPROC l_eglCreateStreamKHR;
ANGLE_UTIL_EXPORT extern PFNEGLDESTROYSTREAMKHRPROC l_eglDestroyStreamKHR;
ANGLE_UTIL_EXPORT extern PFNEGLQUERYSTREAMKHRPROC l_eglQueryStreamKHR;
......
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