From 295f0b133202141deb63e5825a2c62c259b9a706 Mon Sep 17 00:00:00 2001 From: falkTX Date: Fri, 24 Oct 2025 20:06:26 +0200 Subject: [PATCH] Update dpf, use xvfb-run during win32/64 base build Signed-off-by: falkTX --- .github/workflows/build.yml | 2 +- dpf | 2 +- src/CardinalUI.cpp | 14 -------------- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b719da5..19fb6c8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -426,7 +426,7 @@ jobs: export PATH="/usr/lib/ccache:${PATH}" source deps/PawPaw/local.env ${{ matrix.target }} make features - make NOOPT=true -j $(nproc) + xvfb-run make NOOPT=true -j $(nproc) - name: Build cross-compiled (carla) if: steps.cache.outputs.cache-hit == 'true' shell: bash diff --git a/dpf b/dpf index 4238e1c..2cc2280 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit 4238e1c7f0351bbe488d79f0899c540543ac7583 +Subproject commit 2cc2280fa0d060cb137f7ab6f07f8b8b0133f3b4 diff --git a/src/CardinalUI.cpp b/src/CardinalUI.cpp index 806608d..3402e85 100644 --- a/src/CardinalUI.cpp +++ b/src/CardinalUI.cpp @@ -1259,20 +1259,6 @@ protected: #endif } -#if 0 - void uiReshape(const uint width, const uint height) override - { - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glOrtho(0.0, width, 0.0, height, -1.0, 1.0); - glViewport(0, 0, width, height); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - } -#endif - private: /** Set our UI class as non-copyable and add a leak detector just in case.