Non libX11 build fix

Reverted the portion of the following cl which broke the build: https://swiftshader-review.googlesource.com/c/SwiftShader/+/15909 Change-Id: I4a0e7ef5507dd5502861ccf34c400f1feb54b0cc Reviewed-on: https://swiftshader-review.googlesource.com/20228Reviewed-by: Alexis Hétu <sugoi@google.com> Tested-by: Alexis Hétu <sugoi@google.com>

Non libX11 build fix
c47cd435 · Alexis Hetu · Alexis Hétu · dd662d21 · c47cd435
Commit c47cd435 authored Aug 10, 2018 by Alexis Hetu Committed by Alexis Hétu Aug 10, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 12 deletions

libEGL.cpp src/OpenGL/libEGL/libEGL.cpp +15 -12

No files found.
--- a/src/OpenGL/libEGL/libEGL.cpp
+++ b/src/OpenGL/libEGL/libEGL.cpp
@@ -1248,20 +1248,16 @@ EGLDisplay GetPlatformDisplay(EGLenum platform, void *native_display, const EGLA
 	#if defined(__linux__) && !defined(__ANDROID__)
 		switch(platform)
 		{
-		case EGL_PLATFORM_X11_EXT:
-		case EGL_PLATFORM_GBM_KHR:
-			break;
+		#if defined(USE_X11)
+		case EGL_PLATFORM_X11_EXT: break;
+		#endif
+		case EGL_PLATFORM_GBM_KHR: break;
 		default:
 			return error(EGL_BAD_PARAMETER, EGL_NO_DISPLAY);
 		}

-		if(platform == EGL_PLATFORM_X11_EXT)
+		if(platform == EGL_PLATFORM_GBM_KHR)
 		{
-			if(!libX11)
-			{
-				return error(EGL_BAD_PARAMETER, EGL_NO_DISPLAY);
-			}
-
 			if(native_display != (void*)EGL_DEFAULT_DISPLAY)
 			{
 				return error(EGL_BAD_PARAMETER, EGL_NO_DISPLAY);   // Unimplemented
@@ -1271,9 +1267,17 @@ EGLDisplay GetPlatformDisplay(EGLenum platform, void *native_display, const EGLA
 			{
 				return error(EGL_BAD_ATTRIBUTE, EGL_NO_DISPLAY);   // Unimplemented
 			}
+
+			return success(HEADLESS_DISPLAY);
 		}
-		else if(platform == EGL_PLATFORM_GBM_KHR)
+		#if defined(USE_X11)
+		else if(platform == EGL_PLATFORM_X11_EXT)
 		{
+			if(!libX11)
+			{
+				return error(EGL_BAD_PARAMETER, EGL_NO_DISPLAY);
+			}
+
 			if(native_display != (void*)EGL_DEFAULT_DISPLAY)
 			{
 				return error(EGL_BAD_PARAMETER, EGL_NO_DISPLAY);   // Unimplemented
@@ -1283,9 +1287,8 @@ EGLDisplay GetPlatformDisplay(EGLenum platform, void *native_display, const EGLA
 			{
 				return error(EGL_BAD_ATTRIBUTE, EGL_NO_DISPLAY);   // Unimplemented
 			}
-
-			return success(HEADLESS_DISPLAY);
 		}
+		#endif

 		return success(PRIMARY_DISPLAY);   // We only support the default display
 	#else