Consider context promotion when validating share context

We were comparing a pre-promotion version with the post-promotion version stored in the share context. This doesn't work. Affects: dEQP-EGL.functional.sharing.* Change-Id: I02c14681b7743c6aaef4404291ac52a48890832c Reviewed-on: https://swiftshader-review.googlesource.com/20368Tested-by: Chris Forbes <chrisforbes@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com>

Consider context promotion when validating share context
5fb5e817 · Chris Forbes · 62cfbb9c · 5fb5e817
Commit 5fb5e817 authored Aug 30, 2018 by Chris Forbes
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

libEGL.cpp src/OpenGL/libEGL/libEGL.cpp +4 -1

No files found.
--- a/src/OpenGL/libEGL/libEGL.cpp
+++ b/src/OpenGL/libEGL/libEGL.cpp
@@ -865,7 +865,10 @@ EGLContext CreateContext(EGLDisplay dpy, EGLConfig config, EGLContext share_cont
 		return EGL_NO_CONTEXT;
 	}

-	if(shareContext && shareContext->getClientVersion() != majorVersion)
+	// Allow sharing between different context versions >= 2.0, but isolate 1.x
+	// contexts from 2.0+. Strict matching between context versions >= 2.0 is
+	// confusing for apps to navigate because of version promotion.
+	if(shareContext && ((shareContext->getClientVersion() >= 2) ^ (majorVersion >= 2)))
 	{
 		return error(EGL_BAD_CONTEXT, EGL_NO_CONTEXT);
 	}