Skip to content

Commit 327798c

Browse files
committed
Revert "use angle in tests with vulkan software rendering"
This reverts commit a288755.
1 parent 8285cf7 commit 327798c

2 files changed

Lines changed: 2 additions & 13 deletions

File tree

.github/workflows/main.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -120,17 +120,6 @@ jobs:
120120
contents: read
121121
steps:
122122
- uses: actions/checkout@v6
123-
- name: Use software Vulkan for ANGLE
124-
run: |
125-
apt-get update
126-
apt-get install -y mesa-vulkan-drivers vulkan-tools
127-
LVP_ICD="$(find /usr/share/vulkan/icd.d -name 'lvp_icd*.json' | head -n 1)"
128-
if [ -z "$LVP_ICD" ]; then
129-
echo "Mesa lavapipe Vulkan ICD not found" >&2
130-
exit 1
131-
fi
132-
echo "ANGLE_DEFAULT_PLATFORM=vulkan" >> $GITHUB_ENV
133-
echo "VK_ICD_FILENAMES=$LVP_ICD" >> $GITHUB_ENV
134123
- name: Start xvfb
135124
run: |
136125
Xvfb :99 -ac -screen 0 1024x768x24 &
@@ -142,15 +131,14 @@ jobs:
142131
echo "DISPLAY=$DISPLAY"
143132
glxinfo | grep -E "OpenGL version|OpenGL renderer|OpenGL vendor" || true
144133
vulkaninfo --summary || true
145-
echo "ANGLE_DEFAULT_PLATFORM=$ANGLE_DEFAULT_PLATFORM"
146134
echo "VK_ICD_FILENAMES=$VK_ICD_FILENAMES"
147135
echo "MESA_LOADER_DRIVER_OVERRIDE=$MESA_LOADER_DRIVER_OVERRIDE"
148136
echo "GALLIUM_DRIVER=$GALLIUM_DRIVER"
149137
- name: Validate the Gradle wrapper
150138
uses: gradle/actions/wrapper-validation@v6.1.0
151139
- name: Test with Gradle Wrapper
152140
run: |
153-
./gradlew :jme3-screenshot-tests:screenshotTest
141+
./gradlew :jme3-screenshot-test:screenshotTest
154142
- name: Upload Test Reports
155143
uses: actions/upload-artifact@v7.0.0
156144
if: always()

jme3-screenshot-tests/src/main/java/org/jmonkeyengine/screenshottests/testframework/ScreenshotTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ public ScreenshotTest setBaseImageFileName(String baseImageFileName){
102102

103103
public void run(){
104104
AppSettings settings = new AppSettings(true);
105+
settings.setRenderer(AppSettings.LWJGL_OPENGL32);
105106
settings.setResolution(resolution.getWidth(), resolution.getHeight());
106107
settings.setAudioRenderer(null); // Disable audio (for headless)
107108
settings.setUseInput(false); //while it will run with inputs on it causes non-fatal errors.

0 commit comments

Comments
 (0)