Merge pull request #187 from ZLLentz/maint_remove_glx_var

MAINT: remove glx env var, no longer needed and causing issues
pcdshub · Jul 8, 2024 · 1b21455 · 1b21455
2 parents 8e2077a + ac7cfd8
commit 1b21455
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 19 deletions.
diff --git a/scripts/dev_conda b/scripts/dev_conda
@@ -2,7 +2,7 @@
 usage()
 {
 cat << EOF
-usage: source $0 
+usage: source $0
 
 Source this to activate the latest version a pcds conda environment.
 EOF
@@ -55,13 +55,4 @@ source "${TOKEN_DIR}/typhos.sh"
 # The same was done with PyDM and this fixes Designer and friends.
 if [ -n "${SSH_CONNECTION}" ]; then
   export QT_QUICK_BACKEND="software"
-  # Check for errors in the opengl rendering
-  # Manually fall back to mesa library if we know there is a problem
-  if [ -x "$(command -v glxinfo)" ] && [ -z "${__GLX_VENDOR_LIBRARY_NAME}" ]; then
-    # Expecting either a segfault or exit code 1 if there is a problem
-    if ! { glxinfo -B; } > /dev/null 2>&1; then
-      export __GLX_VENDOR_LIBRARY_NAME="mesa"
-    fi
-  fi
 fi
-
diff --git a/scripts/pcds_conda b/scripts/pcds_conda
@@ -127,13 +127,4 @@ source "${TOKEN_DIR}/typhos.sh"
 # The same was done with PyDM and this fixes Designer and friends.
 if [ -n "${SSH_CONNECTION}" ]; then
   export QT_QUICK_BACKEND="software"
-  # Check for errors in the opengl rendering
-  # Manually fall back to mesa library if we know there is a problem
-  if [ -x "$(command -v glxinfo)" ] && [ -z "${__GLX_VENDOR_LIBRARY_NAME}" ]; then
-    # Expecting either a segfault or exit code 1 if there is a problem
-    if ! { glxinfo -B; } > /dev/null 2>&1; then
-      export __GLX_VENDOR_LIBRARY_NAME="mesa"
-    fi
-  fi
 fi
-