Merge pull request #98127 from darksylinc/matias-wayland-build-error

Repiteo · Repiteo · commit 30a2a800dd47 · 2024-10-16T14:16:02.000-05:00
Fix wrong Wayland path if building with opengl3=no
diff --git a/platform/linuxbsd/wayland/display_server_wayland.cpp b/platform/linuxbsd/wayland/display_server_wayland.cpp
@@ -1479,12 +1479,12 @@ DisplayServerWayland::DisplayServerWayland(const String &p_rendering_driver, Win
 			driver_found = true;
 		}
 	}
+#endif // GLES3_ENABLED
 
 	if (!driver_found) {
 		r_error = ERR_UNAVAILABLE;
 		ERR_FAIL_MSG("Video driver not found.");
 	}
-#endif // GLES3_ENABLED
 
 	cursor_set_shape(CURSOR_BUSY);
 

Original file line number	Diff line number	Diff line change
`@@ -1479,12 +1479,12 @@ DisplayServerWayland::DisplayServerWayland(const String &p_rendering_driver, Win`
`1479`	`1479`	`driver_found = true;`
`1480`	`1480`	`}`
`1481`	`1481`	`}`
	`1482`	`+#endif // GLES3_ENABLED`
`1482`	`1483`
`1483`	`1484`	`if (!driver_found) {`
`1484`	`1485`	`r_error = ERR_UNAVAILABLE;`
`1485`	`1486`	`ERR_FAIL_MSG("Video driver not found.");`
`1486`	`1487`	`}`
`1487`		`-#endif // GLES3_ENABLED`
`1488`	`1488`
`1489`	`1489`	`cursor_set_shape(CURSOR_BUSY);`
`1490`	`1490`