diff --git a/scripts/dev_conda b/scripts/dev_conda index f23219d7..0cfce74f 100755 --- 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 index 7ad47665..929c2d53 100755 --- 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 -