summaryrefslogtreecommitdiffstats
path: root/src/egl
diff options
context:
space:
mode:
authorAdam Jackson <[email protected]>2019-05-16 18:01:36 +0100
committerMarek Olšák <[email protected]>2019-06-05 13:35:21 -0400
commit2b29cf2468677a9e9b24b7854e6c2a7acd42a505 (patch)
treeb6c8ae297520963286fb957301e9a53b5e899070 /src/egl
parent4aebd86f9a1b0db0ebcc69c30c00f0981a28e6a6 (diff)
egl: remove Options::Platform handling
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 <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Signed-off-by: Emil Velikov <[email protected]> Signed-off-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/egl')
-rw-r--r--src/egl/main/egldisplay.c13
-rw-r--r--src/egl/main/egldisplay.h1
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;