diff --git a/src/gallium/frontends/dri/dri2.c b/src/gallium/frontends/dri/dri2.c index 8ed1a0c1392..a2585bf5e16 100644 --- a/src/gallium/frontends/dri/dri2.c +++ b/src/gallium/frontends/dri/dri2.c @@ -2383,7 +2383,6 @@ dri_query_compatible_render_only_device_fd(int kms_only_fd) static const struct __DRImesaCoreExtensionRec mesaCoreExtension = { .base = { __DRI_MESA, 2 }, .version_string = MESA_INTERFACE_VERSION_STRING, - .createNewScreen = driCreateNewScreen2, .createContext = driCreateContextAttribs, .initScreen = dri2_init_screen, .queryCompatibleRenderOnlyDeviceFd = dri_query_compatible_render_only_device_fd, @@ -2403,7 +2402,6 @@ const __DRIextension *galliumdrm_driver_extensions[] = { static const struct __DRImesaCoreExtensionRec swkmsMesaCoreExtension = { .base = { __DRI_MESA, 2 }, .version_string = MESA_INTERFACE_VERSION_STRING, - .createNewScreen = driCreateNewScreen2, .createContext = driCreateContextAttribs, .initScreen = dri_swrast_kms_init_screen, .createNewScreen3 = driCreateNewScreen3, diff --git a/src/gallium/frontends/dri/drisw.c b/src/gallium/frontends/dri/drisw.c index fac43691a3b..c50c96902d1 100644 --- a/src/gallium/frontends/dri/drisw.c +++ b/src/gallium/frontends/dri/drisw.c @@ -650,7 +650,6 @@ const __DRIcopySubBufferExtension driSWCopySubBufferExtension = { static const struct __DRImesaCoreExtensionRec mesaCoreExtension = { .base = { __DRI_MESA, 2 }, .version_string = MESA_INTERFACE_VERSION_STRING, - .createNewScreen = driCreateNewScreen2, .createContext = driCreateContextAttribs, .initScreen = drisw_init_screen, .createNewScreen3 = driCreateNewScreen3, diff --git a/src/gallium/frontends/dri/kopper.c b/src/gallium/frontends/dri/kopper.c index 35137ea66dc..d25f255cec0 100644 --- a/src/gallium/frontends/dri/kopper.c +++ b/src/gallium/frontends/dri/kopper.c @@ -941,7 +941,6 @@ const __DRIkopperExtension driKopperExtension = { static const struct __DRImesaCoreExtensionRec mesaCoreExtension = { .base = { __DRI_MESA, 2 }, .version_string = MESA_INTERFACE_VERSION_STRING, - .createNewScreen = driCreateNewScreen2, .createContext = driCreateContextAttribs, .initScreen = kopper_init_screen, .createNewScreen3 = driCreateNewScreen3, diff --git a/src/gallium/include/mesa_interface.h b/src/gallium/include/mesa_interface.h index fffccd817c4..feb8579c275 100644 --- a/src/gallium/include/mesa_interface.h +++ b/src/gallium/include/mesa_interface.h @@ -2162,13 +2162,6 @@ struct __DRImesaCoreExtensionRec { #define MESA_INTERFACE_VERSION_STRING PACKAGE_VERSION MESA_GIT_SHA1 const char *version_string; - /* Screen creation function regardless of DRI2, image, or swrast backend. - * (Nothing uses the old __DRI_CORE screen create). - * - * If not associated with a DRM fd (non-swkms swrast), the fd argument should - * be -1. - */ - __DRIcreateNewScreen2Func createNewScreen; __DRIcreateContextAttribsFunc createContext; @@ -2177,6 +2170,12 @@ struct __DRImesaCoreExtensionRec { int (*queryCompatibleRenderOnlyDeviceFd)(int kms_only_fd); + /* Screen creation function regardless of DRI2, image, or swrast backend. + * (Nothing uses the old __DRI_CORE screen create). + * + * If not associated with a DRM fd (non-swkms swrast), the fd argument should + * be -1. + */ /* version 2 */ __DRIcreateNewScreen3Func createNewScreen3; };