Commit 34c5a1ed authored by Maksim Sisov's avatar Maksim Sisov Committed by Commit Bot

X11/Angle: provide platform type

After https://chromium-review.googlesource.com/c/angle/angle/+/2210151
it's required to pass platform type for X11 so that correct
backend is chosen so that X11/Linux doesn't become broken when compiled
with use_x11 && use_ozone.

Bug: 789065
Change-Id: Ia2e11a89fc358c9976d216f6729c49a28d4661aa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2366755Reviewed-by: default avatarThomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Maksim Sisov (GMT+3) <msisov@igalia.com>
Cr-Commit-Position: refs/heads/master@{#800469}
parent 784394d5
...@@ -18,6 +18,20 @@ ...@@ -18,6 +18,20 @@
#define EGL_PLATFORM_ANGLE_TYPE_NULL_ANGLE 0x33AE #define EGL_PLATFORM_ANGLE_TYPE_NULL_ANGLE 0x33AE
#endif /* EGL_ANGLE_platform_angle_null */ #endif /* EGL_ANGLE_platform_angle_null */
#ifndef EGL_PLATFORM_ANGLE_NATIVE_PLATFORM_TYPE_ANGLE
#define EGL_PLATFORM_ANGLE_NATIVE_PLATFORM_TYPE_ANGLE 0x348F
#endif
#ifndef EGL_ANGLE_platform_angle
#define EGL_ANGLE_platform_angle 1
#define EGL_PLATFORM_ANGLE_NATIVE_PLATFORM_TYPE_ANGLE 0x348F
#endif /* EGL_ANGLE_platform_angle */
#ifndef EGL_EXT_platform_x11
#define EGL_EXT_platform_x11 1
#define EGL_PLATFORM_X11_EXT 0x31D5
#endif /* EGL_EXT_platform_x11 */
namespace ui { namespace ui {
void GetPlatformExtraDisplayAttribs(EGLenum platform_type, void GetPlatformExtraDisplayAttribs(EGLenum platform_type,
...@@ -30,6 +44,8 @@ void GetPlatformExtraDisplayAttribs(EGLenum platform_type, ...@@ -30,6 +44,8 @@ void GetPlatformExtraDisplayAttribs(EGLenum platform_type,
true, &visual_id, nullptr, nullptr, nullptr); true, &visual_id, nullptr, nullptr, nullptr);
attributes->push_back(EGL_X11_VISUAL_ID_ANGLE); attributes->push_back(EGL_X11_VISUAL_ID_ANGLE);
attributes->push_back(static_cast<EGLAttrib>(visual_id)); attributes->push_back(static_cast<EGLAttrib>(visual_id));
attributes->push_back(EGL_PLATFORM_ANGLE_NATIVE_PLATFORM_TYPE_ANGLE);
attributes->push_back(EGL_PLATFORM_X11_EXT);
} }
} }
......
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