Allow the default framebuffer to be an IOSurface

We currently don't allow eglMakeCurrent to take an external buffer, which prevents IOSurfaces from being used as the default framebuffer. However, all the support for rendering to an IOSurface is in place already. It should be fine to remove the check against external buffers in eglMakeCurrent. Bug chromium:987289 Change-Id: I6342e553085f05914db0193500ea018961256a89 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/34388 Presubmit-Ready: Sean Risser <srisser@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com> Tested-by: Sean Risser <srisser@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

Allow the default framebuffer to be an IOSurface
ec303925 · Sean Risser · ec63fbe9 · ec303925 · ec303925
Commit ec303925 authored Jul 24, 2019 by Sean Risser
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 11 deletions

libEGL.cpp src/OpenGL/libEGL/libEGL.cpp +0 -7

unittests.cpp tests/GLESUnitTests/unittests.cpp +4 -4

No files found.
--- a/src/OpenGL/libEGL/libEGL.cpp
+++ b/src/OpenGL/libEGL/libEGL.cpp
@@ -932,13 +932,6 @@ EGLBoolean MakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLCont
 		return EGL_FALSE;
 	}
-	if((draw != EGL_NO_SURFACE && drawSurface->hasClientBuffer()) ||
-	   (read != EGL_NO_SURFACE && readSurface->hasClientBuffer()))
-	{
-		// Make current is not supported on IOSurface pbuffers.
-		return error(EGL_BAD_SURFACE, EGL_FALSE);
-	}
 	if((draw != EGL_NO_SURFACE) ^ (read != EGL_NO_SURFACE))
 	{
 		return error(EGL_BAD_MATCH, EGL_FALSE);

--- a/tests/GLESUnitTests/unittests.cpp
+++ b/tests/GLESUnitTests/unittests.cpp
@@ -2612,8 +2612,8 @@ TEST_F(IOSurfaceClientBufferTest, NegativeValidationBadAttributes)
 	Uninitialize();
 }
-// Test IOSurface pbuffers cannot be made current
+// Test IOSurface pbuffers can be made current
-TEST_F(IOSurfaceClientBufferTest, MakeCurrentDisallowed)
+TEST_F(IOSurfaceClientBufferTest, MakeCurrentAllowed)
 {
 	Initialize(3, false);
@@ -2623,8 +2623,8 @@ TEST_F(IOSurfaceClientBufferTest, MakeCurrentDisallowed)
 		EGLSurface pbuffer = createIOSurfacePbuffer(clientBufferWrapper.getClientBuffer(), 10, 10, 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE);
 		EGLBoolean result = eglMakeCurrent(getDisplay(), pbuffer, pbuffer, getContext());
-		EXPECT_EQ((EGLBoolean)EGL_FALSE, result);
+		EXPECT_EQ((EGLBoolean)EGL_TRUE, result);
-		EXPECT_EQ(EGL_BAD_SURFACE, eglGetError());
+		EXPECT_NO_EGL_ERROR();
 	}
 	Uninitialize();