Skip to content

A
angle
Commit 234fccfb by Jamie Madill Committed by Commit Bot
Options

Entry Points: Add egl:: namespace to Display.

This will prevent symbol collision with X11. This fixes the build integration with Skia. Bug: angleproject:2621 Bug: angleproject:5416 Change-Id: I6949a375cf9fcdd790b4c40ffb82c7c25bc15315 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2567644 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 9fe2d211
Showing with 43 additions and 39 deletions
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":
"88ea1b9bfa43ca1f3083622fe2fa42d2", "5b3752c3e021d3a5cd76a6ccaf5263d7",
"scripts/gl.xml": "scripts/gl.xml":
"f66967f3f3d696b5d8306fd80bbd49a8", "f66967f3f3d696b5d8306fd80bbd49a8",
"scripts/gl_angle_ext.xml": "scripts/gl_angle_ext.xml":
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
"src/libANGLE/frame_capture_utils_autogen.h": "src/libANGLE/frame_capture_utils_autogen.h":
"652b821a877d6eb2c62ba8d151157eea", "652b821a877d6eb2c62ba8d151157eea",
"src/libANGLE/validationEGL_autogen.h": "src/libANGLE/validationEGL_autogen.h":
"b3c0eae46748da68d6833cc40e4bb486", "3927fa260ad183fd9193d65b3f8d82c5",
"src/libANGLE/validationES1_autogen.h": "src/libANGLE/validationES1_autogen.h":
"c8edb0a5b26303bf7c4692b9d0b05c1f", "c8edb0a5b26303bf7c4692b9d0b05c1f",
"src/libANGLE/validationES2_autogen.h": "src/libANGLE/validationES2_autogen.h":
...@@ -118,17 +118,17 @@ ...@@ -118,17 +118,17 @@
"src/libGL/libGL_autogen.def": "src/libGL/libGL_autogen.def":
"2789d87b05eea9f53d52e2aff499b785", "2789d87b05eea9f53d52e2aff499b785",
"src/libGLESv2/egl_ext_stubs_autogen.h": "src/libGLESv2/egl_ext_stubs_autogen.h":
"03de6401c1695f8ca4acbde9c3ae1ba2", "aeb007419aaab7b5e52b084d83dda77c",
"src/libGLESv2/egl_get_labeled_object_data.json": "src/libGLESv2/egl_get_labeled_object_data.json":
"2f4148b2ddf34e62670e32c5e6da4937", "2f4148b2ddf34e62670e32c5e6da4937",
"src/libGLESv2/egl_stubs_autogen.h": "src/libGLESv2/egl_stubs_autogen.h":
"1c9d160acb1ed9bf5e7c26918d4a039e", "6439daa350c1663e71dd0af37dcc91df",
"src/libGLESv2/entry_points_egl_autogen.cpp": "src/libGLESv2/entry_points_egl_autogen.cpp":
"9fd1b2d1e0dbab804e854e33e5bc9ef2", "ba9796b20452dbbe4180480aae02b8a3",
"src/libGLESv2/entry_points_egl_autogen.h": "src/libGLESv2/entry_points_egl_autogen.h":
"3bc7a8df9deadd7cfd615d0cfad0c6a8", "3bc7a8df9deadd7cfd615d0cfad0c6a8",
"src/libGLESv2/entry_points_egl_ext_autogen.cpp": "src/libGLESv2/entry_points_egl_ext_autogen.cpp":
"f52756d7a31ce136ea04a67e0ea1b447", "5397ab40e9cbe1d7aa3faf91154a837a",
"src/libGLESv2/entry_points_egl_ext_autogen.h": "src/libGLESv2/entry_points_egl_ext_autogen.h":
"9154781afd9bd6354ec6fc201b43c790", "9154781afd9bd6354ec6fc201b43c790",
"src/libGLESv2/entry_points_gles_1_0_autogen.cpp": "src/libGLESv2/entry_points_gles_1_0_autogen.cpp":
......
scripts/generate_entry_points.py
...@@ -995,7 +995,8 @@ EGL_PACKED_TYPES = { ...@@ -995,7 +995,8 @@ EGL_PACKED_TYPES = {
"EGLContext": "gl::Context *", "EGLContext": "gl::Context *",
"EGLConfig": "Config *", "EGLConfig": "Config *",
"EGLDeviceEXT": "Device *", "EGLDeviceEXT": "Device *",
"EGLDisplay": "Display *", # Needs an explicit namespace to avoid an X11 namespace collision.
"EGLDisplay": "egl::Display *",
"EGLImage": "Image *", "EGLImage": "Image *",
"EGLImageKHR": "Image *", "EGLImageKHR": "Image *",
"EGLStreamKHR": "Stream *", "EGLStreamKHR": "Stream *",
...@@ -2068,7 +2069,7 @@ def get_egl_entry_point_labeled_object(ep_to_object, cmd_stripped, params, packe ...@@ -2068,7 +2069,7 @@ def get_egl_entry_point_labeled_object(ep_to_object, cmd_stripped, params, packe
return just_the_name_packed(param, packed_enums) return just_the_name_packed(param, packed_enums)
return None return None
display_param = find_param(params, "Display", packed_enums) display_param = find_param(params, "egl::Display", packed_enums)
# For entry points not listed in the JSON file, they default to an EGLDisplay or nothing. # For entry points not listed in the JSON file, they default to an EGLDisplay or nothing.
if cmd_stripped not in ep_to_object: if cmd_stripped not in ep_to_object:
......
src/libGLESv2/egl_stubs_autogen.h
...@@ -33,78 +33,81 @@ class Thread; ...@@ -33,78 +33,81 @@ class Thread;
struct Config; struct Config;
EGLBoolean BindAPI(Thread *thread, EGLenum api); EGLBoolean BindAPI(Thread *thread, EGLenum api);
EGLBoolean BindTexImage(Thread *thread, Display *dpyPacked, Surface *surfacePacked, EGLint buffer); EGLBoolean BindTexImage(Thread *thread,
egl::Display *dpyPacked,
Surface *surfacePacked,
EGLint buffer);
EGLBoolean ChooseConfig(Thread *thread, EGLBoolean ChooseConfig(Thread *thread,
Display *dpyPacked, egl::Display *dpyPacked,
const AttributeMap &attrib_listPacked, const AttributeMap &attrib_listPacked,
EGLConfig *configs, EGLConfig *configs,
EGLint config_size, EGLint config_size,
EGLint *num_config); EGLint *num_config);
EGLint ClientWaitSync(Thread *thread, EGLint ClientWaitSync(Thread *thread,
Display *dpyPacked, egl::Display *dpyPacked,
Sync *syncPacked, Sync *syncPacked,
EGLint flags, EGLint flags,
EGLTime timeout); EGLTime timeout);
EGLBoolean CopyBuffers(Thread *thread, EGLBoolean CopyBuffers(Thread *thread,
Display *dpyPacked, egl::Display *dpyPacked,
Surface *surfacePacked, Surface *surfacePacked,
EGLNativePixmapType target); EGLNativePixmapType target);
EGLContext CreateContext(Thread *thread, EGLContext CreateContext(Thread *thread,
Display *dpyPacked, egl::Display *dpyPacked,
Config *configPacked, Config *configPacked,
gl::Context *share_contextPacked, gl::Context *share_contextPacked,
const AttributeMap &attrib_listPacked); const AttributeMap &attrib_listPacked);
EGLImage CreateImage(Thread *thread, EGLImage CreateImage(Thread *thread,
Display *dpyPacked, egl::Display *dpyPacked,
gl::Context *ctxPacked, gl::Context *ctxPacked,
EGLenum target, EGLenum target,
EGLClientBuffer buffer, EGLClientBuffer buffer,
const AttributeMap &attrib_listPacked); const AttributeMap &attrib_listPacked);
EGLSurface CreatePbufferFromClientBuffer(Thread *thread, EGLSurface CreatePbufferFromClientBuffer(Thread *thread,
Display *dpyPacked, egl::Display *dpyPacked,
EGLenum buftype, EGLenum buftype,
EGLClientBuffer buffer, EGLClientBuffer buffer,
Config *configPacked, Config *configPacked,
const AttributeMap &attrib_listPacked); const AttributeMap &attrib_listPacked);
EGLSurface CreatePbufferSurface(Thread *thread, EGLSurface CreatePbufferSurface(Thread *thread,
Display *dpyPacked, egl::Display *dpyPacked,
Config *configPacked, Config *configPacked,
const AttributeMap &attrib_listPacked); const AttributeMap &attrib_listPacked);
EGLSurface CreatePixmapSurface(Thread *thread, EGLSurface CreatePixmapSurface(Thread *thread,
Display *dpyPacked, egl::Display *dpyPacked,
Config *configPacked, Config *configPacked,
EGLNativePixmapType pixmap, EGLNativePixmapType pixmap,
const AttributeMap &attrib_listPacked); const AttributeMap &attrib_listPacked);
EGLSurface CreatePlatformPixmapSurface(Thread *thread, EGLSurface CreatePlatformPixmapSurface(Thread *thread,
Display *dpyPacked, egl::Display *dpyPacked,
Config *configPacked, Config *configPacked,
void *native_pixmap, void *native_pixmap,
const AttributeMap &attrib_listPacked); const AttributeMap &attrib_listPacked);
EGLSurface CreatePlatformWindowSurface(Thread *thread, EGLSurface CreatePlatformWindowSurface(Thread *thread,
Display *dpyPacked, egl::Display *dpyPacked,
Config *configPacked, Config *configPacked,
void *native_window, void *native_window,
const AttributeMap &attrib_listPacked); const AttributeMap &attrib_listPacked);
EGLSync CreateSync(Thread *thread, EGLSync CreateSync(Thread *thread,
Display *dpyPacked, egl::Display *dpyPacked,
EGLenum type, EGLenum type,
const AttributeMap &attrib_listPacked); const AttributeMap &attrib_listPacked);
EGLSurface CreateWindowSurface(Thread *thread, EGLSurface CreateWindowSurface(Thread *thread,
Display *dpyPacked, egl::Display *dpyPacked,
Config *configPacked, Config *configPacked,
EGLNativeWindowType win, EGLNativeWindowType win,
const AttributeMap &attrib_listPacked); const AttributeMap &attrib_listPacked);
EGLBoolean DestroyContext(Thread *thread, Display *dpyPacked, gl::Context *ctxPacked); EGLBoolean DestroyContext(Thread *thread, egl::Display *dpyPacked, gl::Context *ctxPacked);
EGLBoolean DestroyImage(Thread *thread, Display *dpyPacked, Image *imagePacked); EGLBoolean DestroyImage(Thread *thread, egl::Display *dpyPacked, Image *imagePacked);
EGLBoolean DestroySurface(Thread *thread, Display *dpyPacked, Surface *surfacePacked); EGLBoolean DestroySurface(Thread *thread, egl::Display *dpyPacked, Surface *surfacePacked);
EGLBoolean DestroySync(Thread *thread, Display *dpyPacked, Sync *syncPacked); EGLBoolean DestroySync(Thread *thread, egl::Display *dpyPacked, Sync *syncPacked);
EGLBoolean GetConfigAttrib(Thread *thread, EGLBoolean GetConfigAttrib(Thread *thread,
Display *dpyPacked, egl::Display *dpyPacked,
Config *configPacked, Config *configPacked,
EGLint attribute, EGLint attribute,
EGLint *value); EGLint *value);
EGLBoolean GetConfigs(Thread *thread, EGLBoolean GetConfigs(Thread *thread,
Display *dpyPacked, egl::Display *dpyPacked,
EGLConfig *configs, EGLConfig *configs,
EGLint config_size, EGLint config_size,
EGLint *num_config); EGLint *num_config);
...@@ -119,44 +122,44 @@ EGLDisplay GetPlatformDisplay(Thread *thread, ...@@ -119,44 +122,44 @@ EGLDisplay GetPlatformDisplay(Thread *thread,
const AttributeMap &attrib_listPacked); const AttributeMap &attrib_listPacked);
__eglMustCastToProperFunctionPointerType GetProcAddress(Thread *thread, const char *procname); __eglMustCastToProperFunctionPointerType GetProcAddress(Thread *thread, const char *procname);
EGLBoolean GetSyncAttrib(Thread *thread, EGLBoolean GetSyncAttrib(Thread *thread,
Display *dpyPacked, egl::Display *dpyPacked,
Sync *syncPacked, Sync *syncPacked,
EGLint attribute, EGLint attribute,
EGLAttrib *value); EGLAttrib *value);
EGLBoolean Initialize(Thread *thread, Display *dpyPacked, EGLint *major, EGLint *minor); EGLBoolean Initialize(Thread *thread, egl::Display *dpyPacked, EGLint *major, EGLint *minor);
EGLBoolean MakeCurrent(Thread *thread, EGLBoolean MakeCurrent(Thread *thread,
Display *dpyPacked, egl::Display *dpyPacked,
Surface *drawPacked, Surface *drawPacked,
Surface *readPacked, Surface *readPacked,
gl::Context *ctxPacked); gl::Context *ctxPacked);
EGLenum QueryAPI(Thread *thread); EGLenum QueryAPI(Thread *thread);
EGLBoolean QueryContext(Thread *thread, EGLBoolean QueryContext(Thread *thread,
Display *dpyPacked, egl::Display *dpyPacked,
gl::Context *ctxPacked, gl::Context *ctxPacked,
EGLint attribute, EGLint attribute,
EGLint *value); EGLint *value);
const char *QueryString(Thread *thread, Display *dpyPacked, EGLint name); const char *QueryString(Thread *thread, egl::Display *dpyPacked, EGLint name);
EGLBoolean QuerySurface(Thread *thread, EGLBoolean QuerySurface(Thread *thread,
Display *dpyPacked, egl::Display *dpyPacked,
Surface *surfacePacked, Surface *surfacePacked,
EGLint attribute, EGLint attribute,
EGLint *value); EGLint *value);
EGLBoolean ReleaseTexImage(Thread *thread, EGLBoolean ReleaseTexImage(Thread *thread,
Display *dpyPacked, egl::Display *dpyPacked,
Surface *surfacePacked, Surface *surfacePacked,
EGLint buffer); EGLint buffer);
EGLBoolean ReleaseThread(Thread *thread); EGLBoolean ReleaseThread(Thread *thread);
EGLBoolean SurfaceAttrib(Thread *thread, EGLBoolean SurfaceAttrib(Thread *thread,
Display *dpyPacked, egl::Display *dpyPacked,
Surface *surfacePacked, Surface *surfacePacked,
EGLint attribute, EGLint attribute,
EGLint value); EGLint value);
EGLBoolean SwapBuffers(Thread *thread, Display *dpyPacked, Surface *surfacePacked); EGLBoolean SwapBuffers(Thread *thread, egl::Display *dpyPacked, Surface *surfacePacked);
EGLBoolean SwapInterval(Thread *thread, Display *dpyPacked, EGLint interval); EGLBoolean SwapInterval(Thread *thread, egl::Display *dpyPacked, EGLint interval);
EGLBoolean Terminate(Thread *thread, Display *dpyPacked); EGLBoolean Terminate(Thread *thread, egl::Display *dpyPacked);
EGLBoolean WaitClient(Thread *thread); EGLBoolean WaitClient(Thread *thread);
EGLBoolean WaitGL(Thread *thread); EGLBoolean WaitGL(Thread *thread);
EGLBoolean WaitNative(Thread *thread, EGLint engine); EGLBoolean WaitNative(Thread *thread, EGLint engine);
EGLBoolean WaitSync(Thread *thread, Display *dpyPacked, Sync *syncPacked, EGLint flags); EGLBoolean WaitSync(Thread *thread, egl::Display *dpyPacked, Sync *syncPacked, EGLint flags);
} // namespace egl } // namespace egl
#endif // LIBGLESV2_EGL_STUBS_AUTOGEN_H_ #endif // LIBGLESV2_EGL_STUBS_AUTOGEN_H_
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