egl/gbm: delete remnants of DRI_CORE
Reviewed-by: Adam Jackson <ajax@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30472>
This commit is contained in:
committed by
Marge Bot
parent
3698e10356
commit
0ae7349e06
@@ -585,7 +585,6 @@ const __DRIimageLookupExtension image_lookup_extension = {
|
||||
};
|
||||
|
||||
static const struct dri_extension_match dri3_driver_extensions[] = {
|
||||
{__DRI_CORE, 1, offsetof(struct dri2_egl_display, core), false},
|
||||
{__DRI_MESA, 2, offsetof(struct dri2_egl_display, mesa), false},
|
||||
{__DRI_IMAGE_DRIVER, 2, offsetof(struct dri2_egl_display, image_driver),
|
||||
false},
|
||||
@@ -594,7 +593,6 @@ static const struct dri_extension_match dri3_driver_extensions[] = {
|
||||
};
|
||||
|
||||
static const struct dri_extension_match dri2_driver_extensions[] = {
|
||||
{__DRI_CORE, 1, offsetof(struct dri2_egl_display, core), false},
|
||||
{__DRI_MESA, 2, offsetof(struct dri2_egl_display, mesa), false},
|
||||
{__DRI_DRI2, 5, offsetof(struct dri2_egl_display, dri2), false},
|
||||
{__DRI_CONFIG_OPTIONS, 2, offsetof(struct dri2_egl_display, configOptions),
|
||||
@@ -608,7 +606,6 @@ static const struct dri_extension_match dri2_core_extensions[] = {
|
||||
};
|
||||
|
||||
static const struct dri_extension_match swrast_driver_extensions[] = {
|
||||
{__DRI_CORE, 1, offsetof(struct dri2_egl_display, core), false},
|
||||
{__DRI_MESA, 2, offsetof(struct dri2_egl_display, mesa), false},
|
||||
{__DRI_SWRAST, 5, offsetof(struct dri2_egl_display, swrast), false},
|
||||
{__DRI_CONFIG_OPTIONS, 2, offsetof(struct dri2_egl_display, configOptions),
|
||||
|
||||
@@ -242,7 +242,6 @@ struct dri2_egl_display {
|
||||
__DRIscreen *dri_screen_display_gpu;
|
||||
bool own_dri_screen;
|
||||
const __DRIconfig **driver_configs;
|
||||
const __DRIcoreExtension *core;
|
||||
const __DRImesaCoreExtension *mesa;
|
||||
const __DRIimageDriverExtension *image_driver;
|
||||
const __DRIdri2Extension *dri2;
|
||||
|
||||
@@ -645,7 +645,6 @@ dri2_initialize_drm(_EGLDisplay *disp)
|
||||
}
|
||||
|
||||
dri2_dpy->dri_screen_render_gpu = dri2_dpy->gbm_dri->screen;
|
||||
dri2_dpy->core = dri2_dpy->gbm_dri->core;
|
||||
dri2_dpy->image_driver = dri2_dpy->gbm_dri->image_driver;
|
||||
dri2_dpy->swrast = dri2_dpy->gbm_dri->swrast;
|
||||
dri2_dpy->kopper = dri2_dpy->gbm_dri->kopper;
|
||||
|
||||
@@ -237,13 +237,11 @@ static struct dri_extension_match dri_core_extensions[] = {
|
||||
};
|
||||
|
||||
static struct dri_extension_match gbm_dri_device_extensions[] = {
|
||||
{ __DRI_CORE, 1, offsetof(struct gbm_dri_device, core), false },
|
||||
{ __DRI_MESA, 2, offsetof(struct gbm_dri_device, mesa), false },
|
||||
{ __DRI_IMAGE_DRIVER, 2, offsetof(struct gbm_dri_device, image_driver), false },
|
||||
};
|
||||
|
||||
static struct dri_extension_match gbm_swrast_device_extensions[] = {
|
||||
{ __DRI_CORE, 1, offsetof(struct gbm_dri_device, core), false },
|
||||
{ __DRI_MESA, 2, offsetof(struct gbm_dri_device, mesa), false },
|
||||
{ __DRI_SWRAST, 5, offsetof(struct gbm_dri_device, swrast), false },
|
||||
{ __DRI_KOPPER, 1, offsetof(struct gbm_dri_device, kopper), true },
|
||||
|
||||
@@ -56,7 +56,6 @@ struct gbm_dri_device {
|
||||
__DRIcontext *context;
|
||||
mtx_t mutex;
|
||||
|
||||
const __DRIcoreExtension *core;
|
||||
const __DRImesaCoreExtension *mesa;
|
||||
const __DRIimageExtension *image;
|
||||
const __DRIimageDriverExtension *image_driver;
|
||||
|
||||
Reference in New Issue
Block a user