fix(quickemu): detect GLSL version and enable GL accordingly. close #920

quickemu-project · May 10, 2024 · 16e8115 · 16e8115
1 parent 637f6a9
commit 16e8115
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/debian/control b/debian/control
@@ -17,6 +17,7 @@ Depends:
  curl,
  genisoimage,
  jq,
+ mesa-utils,
  pciutils
  procps,
  python3-minimal,

diff --git a/devshell.nix b/devshell.nix
@@ -3,6 +3,7 @@
   cdrtools,
   curl,
   git,
+  glxinfo
   gnugrep,
   gnused,
   jq,
@@ -29,6 +30,7 @@ mkShell {
     cdrtools
     curl
     git
+    glxinfo
     gnugrep
     gnused
     jq

diff --git a/package.nix b/package.nix
@@ -6,6 +6,7 @@
 , testers
 , cdrtools
 , curl
+, glxinfo
 , gnugrep
 , gnused
 , jq
@@ -30,6 +31,7 @@ let
   runtimePaths = [
     cdrtools
     curl
+    glxinfo
     gnugrep
     gnused
     jq

diff --git a/quickemu b/quickemu
@@ -1872,7 +1872,11 @@ if [ -n "${VM}" ] && [ -e "${VM}" ]; then
 
     # Set the default 3D acceleration.
     if [ -z "${gl}" ]; then
-        gl="on"
+        GLSL_VER=$(glxinfo | grep "OpenGL ES GLSL" | awk '{print $NF}')
+        case ${GLSL_VER} in
+            1*|2*) gl="off";;
+            *) gl="on";;
+        esac
     fi
 
     if [ -z "${PUBLIC}" ]; then
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ @@
       cdrtools,
       curl,
       git,
+      glxinfo
       gnugrep,
       gnused,
       jq,
@@ Expand All / @@ -29,6 +30,7 @@ mkShell { @@
         cdrtools
         curl
         git
+        glxinfo
         gnugrep
         gnused
         jq
@@ Expand Down @@