Skip to content

Commit

Permalink
ENH: Better MESA OpenGL (24.2.7) on Windows (#21)
Browse files Browse the repository at this point in the history
  • Loading branch information
larsoner authored Nov 26, 2024
1 parent 4cf5c60 commit 4f44aea
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 57 deletions.
1 change: 1 addition & 0 deletions .github/workflows/local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ jobs:
python-version: "3.12"
- run: pip install pyvista
- run: python tests/test_pyvista.py
- run: python -c "import pyvista;print(pyvista.Report())"
- uses: actions/upload-artifact@v4
with:
name: ${{ matrix.os }}-${{ matrix.qt }}-sphere
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.DS_Store
8 changes: 2 additions & 6 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,10 @@ runs:
mesa-utils \
x11-utils
- name: Install Windows GL Dependencies
- name: Install OpenGL on Windows
if: runner.os == 'Windows'
shell: cmd
run: |
Set-StrictMode -Version Latest
$ErrorActionPreference = "Stop"
$PSDefaultParameterValues['*:ErrorAction']='Stop'
powershell ${{ github.action_path }}/windows/install_opengl.ps1
run: bash ${{ github.action_path }}\windows\install_opengl.sh

- name: Configure headless display on Linux
if: runner.os == 'Linux'
Expand Down
51 changes: 0 additions & 51 deletions windows/install_opengl.ps1

This file was deleted.

12 changes: 12 additions & 0 deletions windows/install_opengl.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/bash
set -exo pipefail
ls -alt /C/Windows/System32/opengl32.dll
VER="24.2.7"
NAME="mesa3d-${VER}-release-msvc"
curl -LO https://github.com/pal1000/mesa-dist-win/releases/download/${VER}/${NAME}.7z
7z x ${NAME}.7z -o./${NAME}
mv -v ${NAME}/x64/* /C/Windows/System32/
rm -Rf ${NAME}
# takeown "/f" "C:\Windows\System32\opengl32.dll"
# icacls "C:\Windows\System32\opengl32.dll" /grant "$USERNAME:F"
ls -alt /C/Windows/System32/opengl32.dll

0 comments on commit 4f44aea

Please sign in to comment.