fix GHA build issues

Author: wjakob

.github/workflows/build.yml

@@ -17,31 +17,33 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
       - name: Update CMake
-        uses: jwlawson/actions-setup-cmake@v1.13
+        uses: jwlawson/actions-setup-cmake@v2
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         name: Install Python
         with:
-          python-version: '3.9'
-
-      - name: Prepare compiler environment for Windows
-        if: runner.os == 'Windows'
-        uses: ilammy/msvc-dev-cmd@v1
-        with:
-          arch: x64
+          python-version: '3.12'
 
       - name: Install dependencies on Linux
         if: runner.os == 'Linux'
-        run: sudo apt-get install -y xorg-dev libglu1-mesa-dev
+        run: sudo apt-get install -y xorg-dev libglu1-mesa-dev libwayland-dev libxkbcommon-dev libdbus-1-dev
 
-      - name: Configure
-        run: >
-          cmake -S . -B build "-DPython_EXECUTABLE=$(python3 -c 'import sys; print(sys.executable)')"
+      - name: Configure (Windows)
+        if: runner.os == 'Windows'
+        run: |
+          cmake -S . -B build -G "Visual Studio 17 2022" `
+            "-DPython_EXECUTABLE=$(python -c 'import sys; print(sys.executable)')"
+
+      - name: Configure (Linux)
+        if: runner.os == 'Linux'
+        run: |
+          cmake -S . -B build \
+            "-DPython_EXECUTABLE=$(python3 -c 'import sys; print(sys.executable)')"
 
       - name: Build C++
-        run: cmake --build build -j 2
+        run: cmake --build build -j 2 --config Release

CMakeLists.txt

@@ -172,6 +172,7 @@ endif()
 
 # Use C++17, visibility=hidden by default, interprocedural optimization
 set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 
 # Prefer libc++ in conjunction with Clang

ext/glfw

@@ -468,7 +468,7 @@ template <typename Value_, size_t Size_> struct Matrix {
     }
 
     /// Initialize from columns
-    template <typename... Args, std::enable_if_t<(std::is_same_v<Args, Column> && ...), int> = 0>
+    template <typename... Args, std::enable_if_t<std::conjunction_v<std::is_same<Args, Column>...>, int> = 0>
     Matrix(const Args&... args) : m{args...} { }
 
     friend Matrix operator*(const Matrix &a, const Matrix &b) {

include/nanogui/vector.h

@@ -319,7 +319,7 @@ file_dialog(Widget *parent,
         case FileDialogType::Save: {
                 nfdsavedialogu8args_t args = {};
                 args.filterList = nfd_filters.data();
-                args.filterCount = nfd_filters.size();
+                args.filterCount = (nfdfiltersize_t) nfd_filters.size();
                 args.defaultPath = nfd_default_path;
                 args.parentWindow = parent_window;
                 result = NFD_SaveDialogU8_With(&out_path, &args);
@@ -330,7 +330,7 @@ file_dialog(Widget *parent,
         case FileDialogType::OpenMultiple: {
                 nfdopendialogu8args_t args = {};
                 args.filterList = nfd_filters.data();
-                args.filterCount = nfd_filters.size();
+                args.filterCount = (nfdfiltersize_t) nfd_filters.size();
                 args.defaultPath = nfd_default_path;
                 args.parentWindow = parent_window;
 

src/common.cpp

@@ -26,7 +26,7 @@ auto register_vector_type(nb::module_ &m, const char *name) {
            for (size_t i = 0, size = std::min(Vector::Size, nb::len(arr)); i < size; ++i)
                (*v)[i] = nb::cast<Value>(arr[i]);
         })
-        .def("__len__", [](const Vector &) { return Size; })
+        .def("__len__", [](const Vector &) -> size_t { return Vector::Size; })
         .def(-nb::self)
         .def(nb::self == nb::self)
         .def(nb::self != nb::self)
@@ -107,19 +107,17 @@ auto register_matrix_type(nb::module_ &m, const char *name) {
         .def(nb::init<const Matrix &>());
 
     type.def("__init__",
-             [](Matrix *m, const nb::ndarray<Value, nb::f_contig, nb::shape<Size, Size>, nb::ro, nb::device::cpu> &array) {
+             [](Matrix *m, const nb::ndarray<Value, nb::shape<Size, Size>, nb::ro, nb::device::cpu> &array) {
                 new (m) Matrix();
-                memcpy(m->m, array.data(), sizeof(Value)*Size*Size);
-             })
-        .def("__init__",
-             [](Matrix *m, const nb::ndarray<Value, nb::c_contig, nb::shape<Size, Size>, nb::ro, nb::device::cpu> &array) {
-                new (m) Matrix();
-                memcpy(m->m, array.data(), sizeof(Value)*Size*Size);
-                *m = m->T();
+                for (size_t i = 0; i < Matrix::Size; ++i) {
+                    for (size_t j = 0; j < Matrix::Size; ++j) {
+                        m->m[j][i] = array(i, j);  // Column-major storage
+                    }
+                }
              })
         .def_prop_ro("T", &Matrix::T)
         .def("__matmul__", [](const Matrix &a, const Matrix &b) { return a * b; }, nb::is_operator())
-        .def("__len__", [](const Matrix &) { return Size; })
+        .def("__len__", [](const Matrix &) -> size_t { return Matrix::Size; })
         .def("__getitem__", [](const Matrix &m, size_t index) -> const Vector& {
             if (index >= Vector::Size)
                 throw nb::index_error();
@@ -137,7 +135,7 @@ auto register_matrix_type(nb::module_ &m, const char *name) {
                 delete (Matrix *) p;
             });
 
-            return nb::ndarray<float>(&t->m, {Size, Size}, owner);
+            return nb::ndarray<float>(&t->m, {Matrix::Size, Matrix::Size}, owner);
          })
         .def("__repr__", [](const Matrix &m) {
             std::ostringstream oss;

src/python/vector.cpp

@@ -175,12 +175,9 @@ TexturedQuad::TexturedQuad(RenderPass *render_pass, BlendMode blend_mode)
         3, 2, 0
     };
 
-    set_buffer("position", VariableType::Float32, 2,
-               (size_t[]){4, 3}, positions);
-    set_buffer("uv", VariableType::Float32, 2,
-               (size_t[]){4, 2}, uvs);
-    set_buffer("indices", VariableType::UInt32, 1,
-               (size_t[]){6}, indices);
+    set_buffer("position", VariableType::Float32, { 4, 3 }, positions);
+    set_buffer("uv", VariableType::Float32, { 4, 2 }, uvs);
+    set_buffer("indices", VariableType::UInt32, { 6 }, indices);
     set_uniform("mvp",
                 Matrix4f(-1, 0, 0, 0,
                           0, 1, 0, 0,