summaryrefslogtreecommitdiffstats
path: root/src/egl/main/eglapi.c
diff options
context:
space:
mode:
authorChih-Wei Huang <cwhuang@linux.org.tw>2017-01-09 00:30:27 +0800
committerChih-Wei Huang <cwhuang@linux.org.tw>2017-01-09 00:30:27 +0800
commite123ad753c152491c07a5cc6d346f62624b07949 (patch)
tree9095413f68d7d91a7dfc1b18ead20ef5616b43d6 /src/egl/main/eglapi.c
parentdffabc025cca524fecb7a03d0f65ec9c628025f8 (diff)
parentc8ece92ded9337b9ed60aa9568b41313025a1406 (diff)
downloadexternal_mesa3d-e123ad753c152491c07a5cc6d346f62624b07949.zip
external_mesa3d-e123ad753c152491c07a5cc6d346f62624b07949.tar.gz
external_mesa3d-e123ad753c152491c07a5cc6d346f62624b07949.tar.bz2
Merge remote-tracking branch 'mesa/13.0' into nougat-x86
Diffstat (limited to 'src/egl/main/eglapi.c')
-rw-r--r--src/egl/main/eglapi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index 697b6fe..471cf7e 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -849,7 +849,7 @@ _eglCreateWindowSurfaceCommon(_EGLDisplay *disp, EGLConfig config,
RETURN_EGL_ERROR(disp, EGL_BAD_NATIVE_WINDOW, EGL_NO_SURFACE);
#ifdef HAVE_SURFACELESS_PLATFORM
- if (disp->Platform == _EGL_PLATFORM_SURFACELESS) {
+ if (disp && disp->Platform == _EGL_PLATFORM_SURFACELESS) {
/* From the EGL_MESA_platform_surfaceless spec (v1):
*
* eglCreatePlatformWindowSurface fails when called with a <display>
@@ -970,7 +970,7 @@ _eglCreatePixmapSurfaceCommon(_EGLDisplay *disp, EGLConfig config,
EGLSurface ret;
#if HAVE_SURFACELESS_PLATFORM
- if (disp->Platform == _EGL_PLATFORM_SURFACELESS) {
+ if (disp && disp->Platform == _EGL_PLATFORM_SURFACELESS) {
/* From the EGL_MESA_platform_surfaceless spec (v1):
*
* [Like eglCreatePlatformWindowSurface,] eglCreatePlatformPixmapSurface