Fix headless build setup for utilities

Author: Rye

.github/workflows/build.yaml

@@ -137,7 +137,7 @@ jobs:
             libgl1-mesa-dev libglu1-mesa-dev libxinerama-dev \
             libxcursor-dev libxfixes-dev libgstreamer1.0-dev \
             libgstreamer-plugins-base1.0-dev ninja-build libxft-dev \
-            llvm mold libpipewire-0.3-dev libdbus-1-dev
+            llvm mold libpipewire-0.3-dev libosmesa6-dev libdbus-1-dev
           sudo locale-gen en_US.UTF-8
           sudo locale-gen en_GB.UTF-8
           sudo locale-gen fr_FR.UTF-8

autobuild.xml

@@ -1267,36 +1267,6 @@
         <key>description</key>
         <string>PNG Reference library</string>
       </map>
-      <key>libuuid</key>
-      <map>
-        <key>platforms</key>
-        <map>
-          <key>linux64</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>fb89f1281dd54d8b99b339fc5b712b27</string>
-              <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-libuuid/rev/314269/arch/Linux/installer/libuuid-1.6.2-linux64-314269.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>linux64</string>
-          </map>
-        </map>
-        <key>license</key>
-        <string>UUID</string>
-        <key>license_file</key>
-        <string>LICENSES/uuid.txt</string>
-        <key>copyright</key>
-        <string>Copyright (c) 2004-2008 The OSSP Project &lt;http://www.ossp.org/&gt;</string>
-        <key>version</key>
-        <string>1.6.2</string>
-        <key>name</key>
-        <string>libuuid</string>
-        <key>description</key>
-        <string>OSSP uuid is a ISO-C:1999 application programming interface (API) and corresponding command line interface (CLI) for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant Universally Unique Identifier (UUID). </string>
-      </map>
       <key>libxml2</key>
       <map>
         <key>platforms</key>
@@ -1646,32 +1616,6 @@
         <key>description</key>
         <string>Luau is a fast, small, safe, gradually typed embeddable scripting language derived from Lua.</string>
       </map>
-      <key>mesa</key>
-      <map>
-        <key>platforms</key>
-        <map>
-          <key>linux</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>22c50a5d362cad311b4f413cfcffbba2</string>
-              <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/mesa_3p-update-mesa/rev/297294/arch/Linux/installer/mesa-7.11.1.297294-linux-297294.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>linux</string>
-          </map>
-        </map>
-        <key>license</key>
-        <string>mesa</string>
-        <key>license_file</key>
-        <string>LICENSES/mesa.txt</string>
-        <key>version</key>
-        <string>7.11.1.297294</string>
-        <key>name</key>
-        <string>mesa</string>
-      </map>
       <key>meshoptimizer</key>
       <map>
         <key>platforms</key>

indra/cmake/Variables.cmake

@@ -129,11 +129,11 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
   if (INSTALL_PROPRIETARY)
     # Only turn on headless if we can find osmesa libraries.
-    include(FindPkgConfig)
-    #pkg_check_modules(OSMESA osmesa)
-    #if (OSMESA_FOUND)
-    #  set(BUILD_HEADLESS ON CACHE BOOL "Build headless libraries.")
-    #endif (OSMESA_FOUND)
+    find_package(PkgConfig)
+    pkg_check_modules(OSMESA osmesa IMPORTED_TARGET GLOBAL)
+    if (OSMESA_FOUND)
+     set(BUILD_HEADLESS ON CACHE BOOL "Build headless libraries.")
+    endif (OSMESA_FOUND)
   endif (INSTALL_PROPRIETARY)
 
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")

indra/llappearance/CMakeLists.txt

@@ -76,6 +76,7 @@ if (BUILD_HEADLESS)
           llcharacter
           llinventory
           llimage
+          llrenderheadless
           llfilesystem
           llmath
           llxml

indra/llappearanceutility/CMakeLists.txt

@@ -73,13 +73,13 @@ if (BUILD_HEADLESS)
   add_executable(appearance-utility-headless-bin ${appearance_utility_SOURCE_FILES})
 
   target_link_libraries(appearance-utility-headless-bin
-      ${LLAPPEARANCE_HEADLESS_LIBRARIES}
-      ${LLWINDOW_HEADLESS_LIBRARIES}
-      ${BOOST_COROUTINE_LIBRARY}
-      ${BOOST_CONTEXT_LIBRARY}
-      ${BOOST_SYSTEM_LIBRARY}
-      ${TCMALLOC_LIBRARIES}
-      )
+    llcharacter
+    llinventory
+    llappearanceheadless
+    llwindowheadless
+    llrenderheadless
+    llxml
+    )
 
   add_custom_target(appearance-utility-headless-bin-target ALL
                     DEPENDS appearance-utility-headless-bin)

indra/llrender/CMakeLists.txt

@@ -72,6 +72,7 @@ if (BUILD_HEADLESS)
   add_library (llrenderheadless
     ${llrender_SOURCE_FILES}
     )
+  target_include_directories( llrenderheadless  INTERFACE   ${CMAKE_CURRENT_SOURCE_DIR})
 
   set_property(TARGET llrenderheadless
     PROPERTY COMPILE_DEFINITIONS LL_MESA=1 LL_MESA_HEADLESS=1
@@ -81,9 +82,11 @@ if (BUILD_HEADLESS)
           llcommon
           llimage
           llmath
-          llrender
           llxml
           llfilesystem
+          llwindowheadless
+          ll::freetype
+          OpenGL::GL
           )
 endif (BUILD_HEADLESS)
 
@@ -101,6 +104,5 @@ target_link_libraries(llrender
         llwindow
         ll::freetype
         OpenGL::GL
-        OpenGL::GLU
         )
 

indra/llwindow/CMakeLists.txt

@@ -80,19 +80,6 @@ if (LINUX)
        llkeyboardsdl.h
        llwindowsdl.h
        )
-
-  if (BUILD_HEADLESS)
-    set(llwindowheadless_LINK_LIBRARIES
-        ${LLCOMMON_LIBRARIES}
-        ${LLIMAGE_LIBRARIES}
-        ${LLMATH_LIBRARIES}
-        ${LLRENDER_HEADLESS_LIBRARIES}
-        ${LLFILESYSTEM_LIBRARIES}
-        ${LLWINDOW_HEADLESS_LIBRARIES}
-        ${LLXML_LIBRARIES}
-        fontconfig          # For FCInit and other FC* functions.
-        )
-  endif (BUILD_HEADLESS)
 endif (LINUX)
 
 if (DARWIN)
@@ -141,32 +128,52 @@ if (WINDOWS)
        )
 endif (WINDOWS)
 
-if (SOLARIS)
-  list(APPEND llwindow_SOURCE_FILES
-       llwindowsolaris.cpp
-       )
-  list(APPEND llwindow_HEADER_FILES
-       llwindowsolaris.h
-       )
-endif (SOLARIS)
-
 if (BUILD_HEADLESS)
   set(llwindowheadless_SOURCE_FILES
-       llwindowmesaheadless.cpp
-       llmousehandler.cpp
-       )
+      llcursortypes.cpp
+      llkeyboard.cpp
+      llkeyboardheadless.cpp
+      llwindowheadless.cpp
+      llwindowcallbacks.cpp
+      llwindow.cpp
+      llwindowmesaheadless.cpp
+      llmousehandler.cpp
+      )
+
   set(llwindowheadless_HEADER_FILES
-       llwindowmesaheadless.h
-       llmousehandler.h
-    )
+      llcursortypes.h
+      llkeyboard.h
+      llkeyboardheadless.h
+      llwindowheadless.h
+      llwindowcallbacks.h
+      llwindowmesaheadless.h
+      llmousehandler.h
+      )
+
   add_library (llwindowheadless
-    ${llwindow_SOURCE_FILES}
     ${llwindowheadless_SOURCE_FILES}
+    ${llwindowheadless_HEADER_FILES}
     )
+
   set_property(TARGET llwindowheadless
     PROPERTY COMPILE_DEFINITIONS LL_MESA=1 LL_MESA_HEADLESS=1
     )
-  target_link_libraries (llwindowheadless ${llwindowheadless_LINK_LIBRARIES} dl)
+
+  target_link_libraries (llwindowheadless 
+  llcommon
+  llimage
+  llmath
+  llrenderheadless
+  llfilesystem
+  llxml
+  ll::glm
+  ll::glext
+  ll::zlib-ng
+  PkgConfig::OSMESA 
+  fontconfig 
+  dl
+  )
+  target_include_directories(llwindowheadless INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
 endif (BUILD_HEADLESS)
 
 if (llwindow_HEADER_FILES)

indra/llwindow/llwindow.cpp

@@ -264,7 +264,7 @@ std::vector<std::string> LLWindow::getDynamicFallbackFontList()
     return LLWindowWin32::getDynamicFallbackFontList();
 #elif LL_DARWIN
     return LLWindowMacOSX::getDynamicFallbackFontList();
-#elif LL_LINUX
+#elif LL_LINUX && !defined(LL_MESA)
     return LLWindowSDL::getDynamicFallbackFontList();
 #else
     return std::vector<std::string>();
@@ -416,9 +416,9 @@ LLWindow* LLWindowManager::createWindow(
 
     if (use_gl)
     {
-#ifndef LL_DARWIN
-        // SDL2 is temporarily disabled on Mac
-        init_sdl();
+// SDL2 is temporarily disabled on Mac
+#if !defined(LL_DARWIN) && !defined(LL_MESA_HEADLESS)
+    init_sdl();
 #endif
 
 #if LL_WINDOWS
@@ -468,7 +468,9 @@ bool LLWindowManager::destroyWindow(LLWindow* window)
     window->close();
 
     sWindowList.erase(window);
+#ifndef LL_MESA_HEADLESS
     quit_sdl();
+#endif
 
     delete window;
 

indra/llwindow/llwindowmesaheadless.h

@@ -39,16 +39,16 @@ class LLWindowMesaHeadless : public LLWindow
     void show() override {};
     void hide() override {};
     void close() override {};
-    bool getVisible() override {return false;};
-    bool getMinimized() override {return false;};
-    bool getMaximized() override {return false;};
+    bool getVisible() const override {return false;};
+    bool getMinimized() const override {return false;};
+    bool getMaximized() const override {return false;};
     bool maximize() override {return false;};
     void minimize() override {};
     void restore() override {};
-    bool getFullscreen() override {return false;};
-    bool getPosition(LLCoordScreen *position) override {return false;};
-    bool getSize(LLCoordScreen *size) override {return false;};
-    bool getSize(LLCoordWindow *size) override {return false;};
+    bool getFullscreen() const override {return false;};
+    bool getPosition(LLCoordScreen *position) const override {return false;};
+    bool getSize(LLCoordScreen *size) const override {return false;};
+    bool getSize(LLCoordWindow *size) const override {return false;};
     bool setPosition(LLCoordScreen position) override {return false;};
     bool setSizeImpl(LLCoordScreen size) override {return false;};
     bool switchContext(bool fullscreen, const LLCoordScreen &size, bool disable_vsync, const LLCoordScreen * const posp = NULL) override {return false;};
@@ -68,24 +68,30 @@ class LLWindowMesaHeadless : public LLWindow
     bool pasteTextFromClipboard(LLWString &dst) override {return false; };
     bool copyTextToClipboard(const LLWString &src) override {return false; };
     void flashIcon(F32 seconds) override {};
-    F32 getGamma() override {return 1.0f; };
+    F32 getGamma() const override {return 1.0f; };
     bool setGamma(const F32 gamma) override {return false; }; // Set the gamma
     bool restoreGamma() override {return false; };   // Restore original gamma table (before updating gamma)
     void setFSAASamples(const U32 fsaa_samples) override { /* FSAA not supported yet on Mesa headless.*/ }
-    U32  getFSAASamples() override { return 0; }
+    U32  getFSAASamples() const override { return 0; }
     //ESwapMethod getSwapMethod() override { return mSwapMethod; }
     void gatherInput(bool app_has_focus) override {};
     void delayInputProcessing() override {};
     void swapBuffers() override;
-    void restoreGLContext() override {};
+
+    void* createSharedContext()override{return nullptr;};
+    void makeContextCurrent(void* context)override{};
+    void destroySharedContext(void* context)override{};
+    void toggleVSync(bool enable_vsync) override {};
+    bool setSizeImpl(LLCoordWindow size) override { return false; };
+
 
     // handy coordinate space conversion routines
-    bool convertCoords(LLCoordScreen from, LLCoordWindow *to) override { return false; };
-    bool convertCoords(LLCoordWindow from, LLCoordScreen *to) override { return false; };
-    bool convertCoords(LLCoordWindow from, LLCoordGL *to) override { return false; };
-    bool convertCoords(LLCoordGL from, LLCoordWindow *to) override { return false; };
-    bool convertCoords(LLCoordScreen from, LLCoordGL *to) override { return false; };
-    bool convertCoords(LLCoordGL from, LLCoordScreen *to) override { return false; };
+    bool convertCoords(LLCoordScreen from, LLCoordWindow *to) const override { return false; };
+    bool convertCoords(LLCoordWindow from, LLCoordScreen *to) const override { return false; };
+    bool convertCoords(LLCoordWindow from, LLCoordGL *to) const override { return false; };
+    bool convertCoords(LLCoordGL from, LLCoordWindow *to) const override { return false; };
+    bool convertCoords(LLCoordScreen from, LLCoordGL *to) const override { return false; };
+    bool convertCoords(LLCoordGL from, LLCoordScreen *to) const override { return false; };
 
     LLWindowResolution* getSupportedResolutions(S32 &num_resolutions) override { return NULL; };
     F32 getNativeAspectRatio() override { return 1.0f; };

indra/newview/viewer_manifest.py

@@ -1234,7 +1234,8 @@ def construct(self):
         app_util = os.path.join(self.args['build'], '../llappearanceutility')
         if os.path.isdir(app_util):
             with self.prefix(app_util):
-                self.path("appearance-utility-bin", "appearance-utility-bin")
+                self.path("appearance-utility-bin")
+                self.path("appearance-utility-headless-bin")
 
         # recurses, packaged again
         self.path("res-sdl")