Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Checking if glamor_egl_get_driver_name exists #238

Closed
wants to merge 2 commits into from
Closed

Checking if glamor_egl_get_driver_name exists #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9445265
Update configure.ac
laigor Sep 26, 2022
fb37fe7
Update xrdpdri2.c
laigor Sep 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ if test "x${enable_glamor}" = "xyes"; then
PKG_CHECK_MODULES([XORG_SERVER_GBM], [gbm >= 0], [], [AC_MSG_ERROR([please install libgbm-dev or mesa-libgbm-devel])])
PKG_CHECK_MODULES([XORG_SERVER_EPOXY], [epoxy >= 0], [], [AC_MSG_ERROR([please install libepoxy-dev or libepoxy-devel])])
PKG_CHECK_MODULES([XORG_SERVER_EGL], [egl >= 0], [], [AC_MSG_ERROR([please install libegl1-mesa-dev or mesa-libEGL-devel])])
PKG_CHECK_EXISTS(epoxy >= 1.5.4, [AC_DEFINE(GLAMOR_HAS_EGL_QUERY_DRIVER, 1, [Have GLAMOR_HAS_EGL_QUERY_DRIVER])], [])
fi

if test "x$XRDP_CFLAGS" = "x"; then
Expand Down
4 changes: 3 additions & 1 deletion xrdpdev/xrdpdri2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,9 @@ rdpDri2Init(ScreenPtr pScreen)
/* This ensures that dri/va (=driver[0]) and vdpau (=driver[1]) */
/* get the correct values. Currently only needed for intel drivers. */
/* Ask Glamor to obtain the DRI driver name via EGL_MESA_query_driver. */
driver_names[0] = glamor_egl_get_driver_name(pScreen);
#if defined(GLAMOR_HAS_EGL_QUERY_DRIVER)
driver_names[0] = glamor_egl_get_driver_name(pScreen);
#endif

if (driver_names[0])
{
Expand Down