diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2017-03-25 00:29:31 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2017-03-25 00:29:31 +0000 |
| commit | c83cf8802f5c955b3ff83408a0f5c41f63fcb415 (patch) | |
| tree | 23e00e49e6f2ceaae6e560f8ca02088ecd62c3bc /lib/mesa/src/egl | |
| parent | 0ad866088a8e454456ac70baecf687d8a5d778c6 (diff) | |
Merge Mesa 13.0.6
Diffstat (limited to 'lib/mesa/src/egl')
| -rw-r--r-- | lib/mesa/src/egl/Makefile.in | 1 | ||||
| -rw-r--r-- | lib/mesa/src/egl/drivers/dri2/egl_dri2.c | 14 | ||||
| -rw-r--r-- | lib/mesa/src/egl/wayland/wayland-drm/Makefile.in | 1 | ||||
| -rw-r--r-- | lib/mesa/src/egl/wayland/wayland-egl/Makefile.in | 1 |
4 files changed, 17 insertions, 0 deletions
diff --git a/lib/mesa/src/egl/Makefile.in b/lib/mesa/src/egl/Makefile.in index cd747103b..cc2ead011 100644 --- a/lib/mesa/src/egl/Makefile.in +++ b/lib/mesa/src/egl/Makefile.in @@ -295,6 +295,7 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@ CLOCK_LIB = @CLOCK_LIB@ +CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ diff --git a/lib/mesa/src/egl/drivers/dri2/egl_dri2.c b/lib/mesa/src/egl/drivers/dri2/egl_dri2.c index f1f473ca6..196d3c776 100644 --- a/lib/mesa/src/egl/drivers/dri2/egl_dri2.c +++ b/lib/mesa/src/egl/drivers/dri2/egl_dri2.c @@ -1086,6 +1086,20 @@ dri2_create_context(_EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf, if (!_eglInitContext(&dri2_ctx->base, disp, conf, attrib_list)) goto cleanup; + /* The EGL_EXT_create_context_robustness spec says: + * + * "Add to the eglCreateContext context creation errors: [...] + * + * * If the reset notification behavior of <share_context> and the + * newly created context are different then an EGL_BAD_MATCH error is + * generated." + */ + if (share_list && share_list->ResetNotificationStrategy != + dri2_ctx->base.ResetNotificationStrategy) { + _eglError(EGL_BAD_MATCH, "eglCreateContext"); + goto cleanup; + } + switch (dri2_ctx->base.ClientAPI) { case EGL_OPENGL_ES_API: switch (dri2_ctx->base.ClientMajorVersion) { diff --git a/lib/mesa/src/egl/wayland/wayland-drm/Makefile.in b/lib/mesa/src/egl/wayland/wayland-drm/Makefile.in index 852d277c5..8a28a8d77 100644 --- a/lib/mesa/src/egl/wayland/wayland-drm/Makefile.in +++ b/lib/mesa/src/egl/wayland/wayland-drm/Makefile.in @@ -143,6 +143,7 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@ CLOCK_LIB = @CLOCK_LIB@ +CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ diff --git a/lib/mesa/src/egl/wayland/wayland-egl/Makefile.in b/lib/mesa/src/egl/wayland/wayland-egl/Makefile.in index b039ed6e7..1ba116e35 100644 --- a/lib/mesa/src/egl/wayland/wayland-egl/Makefile.in +++ b/lib/mesa/src/egl/wayland/wayland-egl/Makefile.in @@ -185,6 +185,7 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLANG_RESOURCE_DIR = @CLANG_RESOURCE_DIR@ CLOCK_LIB = @CLOCK_LIB@ +CLOVER_STD_OVERRIDE = @CLOVER_STD_OVERRIDE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ |