From 2b29cf2468677a9e9b24b7854e6c2a7acd42a505 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 16 May 2019 18:01:36 +0100 Subject: [PATCH] egl: remove Options::Platform handling MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The full set of attributes is already handled with previous patches. Thus all this is not dead code. v2 (Emil) - split from a larger patch. Reviewed-by: Mathias Fröhlich Reviewed-by: Marek Olšák Signed-off-by: Emil Velikov Signed-off-by: Marek Olšák --- src/egl/main/egldisplay.c | 13 ++++--------- src/egl/main/egldisplay.h | 1 - 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/egl/main/egldisplay.c b/src/egl/main/egldisplay.c index 9a2ac48e8bc..418ab0ec9b8 100644 --- a/src/egl/main/egldisplay.c +++ b/src/egl/main/egldisplay.c @@ -497,17 +497,12 @@ _eglParseX11DisplayAttribList(_EGLDisplay *display, return EGL_TRUE; } + /* EGL_EXT_platform_x11 recognizes exactly one attribute, + * EGL_PLATFORM_X11_SCREEN_EXT, which is optional. + */ for (i = 0; attrib_list[i] != EGL_NONE; i += 2) { - EGLAttrib attrib = attrib_list[i]; - EGLAttrib value = attrib_list[i + 1]; - - /* EGL_EXT_platform_x11 recognizes exactly one attribute, - * EGL_PLATFORM_X11_SCREEN_EXT, which is optional. - */ - if (attrib != EGL_PLATFORM_X11_SCREEN_EXT) + if (attrib_list[i] != EGL_PLATFORM_X11_SCREEN_EXT) return _eglError(EGL_BAD_ATTRIBUTE, "eglGetPlatformDisplay"); - - display->Options.Platform = (void *)(uintptr_t)value; } return EGL_TRUE; diff --git a/src/egl/main/egldisplay.h b/src/egl/main/egldisplay.h index 2c9fd6c3399..369ab31187f 100644 --- a/src/egl/main/egldisplay.h +++ b/src/egl/main/egldisplay.h @@ -167,7 +167,6 @@ struct _egl_display /* options that affect how the driver initializes the display */ struct { EGLBoolean ForceSoftware; /**< Use software path only */ - void *Platform; /**< Platform-specific options */ EGLAttrib *Attribs; /**< Platform-specific options */ } Options; -- 2.30.2