GitHub Actions: update to Ubuntu-24.04

Author: TheMostDiligent

.github/workflows/build-emscripten.yml

@@ -6,7 +6,7 @@ jobs:
   build:
     strategy:
       matrix:
-        os:         [windows-latest, ubuntu-20.04, macos-14]
+        os:         [windows-latest, ubuntu-24.04, macos-14]
         build_type: [Debug, Release]
 
         exclude:
@@ -18,7 +18,7 @@ jobs:
           - os:        windows-latest
             host_name: Win10
 
-          - os:        ubuntu-20.04
+          - os:        ubuntu-24.04
             host_name: Linux
 
           - os:        macos-14

.github/workflows/build-linux.yml

@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
   precheks:
     name:    Linux -> Pre-checks
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Clone DiligentCore
@@ -35,7 +35,7 @@ jobs:
 
   build:
     needs:   precheks
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     strategy:
       matrix:
@@ -46,13 +46,13 @@ jobs:
         include:
           - name:            "GCC"
             cmake_generator: "Unix Makefiles"
-            cc:              "gcc-9"
-            cxx:             "g++-9"
+            cc:              "gcc-14"
+            cxx:             "g++-14"
 
           - name:            "Clang"
             cmake_generator: "Ninja"
-            cc:              "clang-12"
-            cxx:             "clang++-12"
+            cc:              "clang-18"
+            cxx:             "clang++-18"
 
     name: Linux -> ${{ matrix.name }}-x64, ${{ matrix.build_type }}
 

HLSL2GLSLConverter/src/HLSL2GLSLConverterAppLinux.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2022 Diligent Graphics LLC
+ *  Copyright 2019-2025 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,7 +43,7 @@ int main(int argc, char** argv)
     HLSL2GLSLConverterApp Converter;
 
     {
-        auto ret = Converter.ParseCmdLine(argc, argv);
+        int ret = Converter.ParseCmdLine(argc, argv);
         if (ret != 0)
             return ret;
     }
@@ -53,7 +53,7 @@ int main(int argc, char** argv)
     RefCntAutoPtr<ISwapChain>     pSwapChain;
 
     Display* display = nullptr;
-    Window win = 0;
+    Window   win     = 0;
     if (Converter.NeedsCompileShader())
     {
         display = XOpenDisplay(0);
@@ -77,7 +77,8 @@ int main(int argc, char** argv)
             GLX_DEPTH_SIZE,     24,
 
             //GLX_SAMPLE_BUFFERS, 1,
-            GLX_SAMPLES, 1,
+            //GLX_SAMPLES, 1, // 0 Means no MSAA. 1 Requests any MSAA.
+                              // If MSAA is not supported, glXChooseFBConfig will fail.
             None
         };
         // clang-format on
@@ -112,7 +113,7 @@ int main(int argc, char** argv)
         }
 
         {
-            auto SizeHints        = XAllocSizeHints();
+            XSizeHints* SizeHints = XAllocSizeHints();
             SizeHints->flags      = PMinSize;
             SizeHints->min_width  = 320;
             SizeHints->min_height = 240;
@@ -154,7 +155,7 @@ int main(int argc, char** argv)
         };
         // clang-format on
 
-        GLXContext ctx  = glXCreateContextAttribsARB(display, fbc[0], NULL, 1, context_attribs);
+        GLXContext ctx = glXCreateContextAttribsARB(display, fbc[0], NULL, 1, context_attribs);
         if (!ctx)
         {
             LOG_ERROR_MESSAGE("Failed to create GL context.");
@@ -163,21 +164,21 @@ int main(int argc, char** argv)
         XFree(fbc);
 
         glXMakeCurrent(display, win, ctx);
-        
-        auto* pFactory = Converter.GetFactoryGL();
-        EngineGLCreateInfo CreationAttribs;
-        SwapChainDesc      SCDesc;
+
+        IEngineFactoryOpenGL* pFactory = Converter.GetFactoryGL();
+        EngineGLCreateInfo    CreationAttribs;
+        SwapChainDesc         SCDesc;
         CreationAttribs.Window.WindowId = win;
         CreationAttribs.Window.pDisplay = display;
         pFactory->CreateDeviceAndSwapChainGL(
             CreationAttribs, &pDevice, &pContext, SCDesc, &pSwapChain);
     }
 
-    auto ret = Converter.Convert(pDevice);
+    int ret = Converter.Convert(pDevice);
 
     if (display != nullptr)
     {
-        auto ctx = glXGetCurrentContext();
+        GLXContext ctx = glXGetCurrentContext();
         glXMakeCurrent(display, None, NULL);
         glXDestroyContext(display, ctx);
         XDestroyWindow(display, win);