Fix delegating eglCreateWindowSurface to CreatePlatformWindowSurface

Only with X11 does eglCreatePlatformWindowSurface take a pointer to a window handle instead of a handle value directly. Since eglCreateWindowSurface delegates to CreatePlatformWindowSurface, it must take the address of the window handle. Bug: b/168821209 Change-Id: I69c7bf3315a871c2cd806a736fd73606cac34ad2 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/48789Reviewed-by: Antonio Maiorano <amaiorano@google.com> Kokoro-Result: kokoro <noreply+kokoro@google.com> Tested-by: Nicolas Caramelli <caramelli.devel@gmail.com>

Fix delegating eglCreateWindowSurface to CreatePlatformWindowSurface
de0105d0 · Nicolas Capens · Nicolas Caramelli · d75c5e18 · de0105d0
Commit de0105d0 authored Sep 30, 2020 by Nicolas Capens Committed by Nicolas Caramelli Sep 30, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 4 deletions

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

No files found.
--- a/src/OpenGL/libEGL/libEGL.cpp
+++ b/src/OpenGL/libEGL/libEGL.cpp
@@ -361,9 +361,9 @@ EGLSurface EGLAPIENTRY CreatePlatformWindowSurface(EGLDisplay dpy, EGLConfig con
 		return EGL_NO_SURFACE;
 	}
-#if defined(USE_X11)
+	#if defined(USE_X11)
-	native_window = (void *)(*(::Window*)native_window);
+		native_window = (void *)(*(::Window*)native_window);
-#endif
+	#endif
 	if(!display->isValidWindow((EGLNativeWindowType)native_window))
 	{
@@ -388,7 +388,12 @@ EGLSurface EGLAPIENTRY CreateWindowSurface(EGLDisplay dpy, EGLConfig config, EGL
 	      "const EGLint *attrib_list = %p)", dpy, config, window, attrib_list);
 	EGLAttribs attribs(attrib_list);
-	return CreatePlatformWindowSurface(dpy, config, (void*)window, &attribs);
+	#if defined(USE_X11)
+		return CreatePlatformWindowSurface(dpy, config, (void*)&window, &attribs);
+	#else
+		return CreatePlatformWindowSurface(dpy, config, (void*)window, &attribs);
+	#endif
 }
 EGLSurface EGLAPIENTRY CreatePbufferSurface(EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list)