From 652e367d5f9afd7bb511272e5b5bb54087eaf80c Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 1 Feb 2017 09:31:56 +0000 Subject: [PATCH] docs/releasing: tweak the glxinfo/glxgear/etc. command lines Print only the information needed. Namely: *info: the DRI module picked and the vendor/renderer strings *gears: everything but the "...configuration file..." line(s) v2: (Eric) Use "2>&1 |" over "|&", properly escape &. Signed-off-by: Emil Velikov --- docs/releasing.html | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/docs/releasing.html b/docs/releasing.html index ec1baee0943..1bf88474f35 100644 --- a/docs/releasing.html +++ b/docs/releasing.html @@ -366,24 +366,28 @@ Here is one solution that I've been using. --enable-egl \ --with-egl-platforms=x11,drm,wayland make -j2 && DESTDIR=`pwd`/test make -j6 install + __glxinfo_cmd='glxinfo 2>&1 | egrep -o "Mesa.*|Gallium.*|.*dri\.so"' + __glxgears_cmd='glxgears 2>&1 | grep -v "configuration file"' + __es2info_cmd='es2_info 2>&1 | egrep "GL_VERSION|GL_RENDERER|.*dri\.so"' + __es2gears_cmd='es2gears_x11 2>&1 | grep -v "configuration file"' export LD_LIBRARY_PATH=`pwd`/test/usr/local/lib/ export LIBGL_DRIVERS_PATH=`pwd`/test/usr/local/lib/dri/ export LIBGL_DEBUG=verbose - glxinfo | egrep -o "Mesa.*" - glxgears - es2_info | egrep "GL_VERSION|GL_RENDERER" - es2gears_x11 + eval $__glxinfo_cmd + eval $__glxgears_cmd + eval $__es2info_cmd + eval $__es2gears_cmd export LIBGL_ALWAYS_SOFTWARE=1 - glxinfo | egrep -o "Mesa.*|Gallium.*" - glxgears - es2_info | egrep "GL_VERSION|GL_RENDERER" - es2gears_x11 + eval $__glxinfo_cmd + eval $__glxgears_cmd + eval $__es2info_cmd + eval $__es2gears_cmd export LIBGL_ALWAYS_SOFTWARE=1 export GALLIUM_DRIVER=softpipe - glxinfo | egrep -o "Mesa.*|Gallium.*" - glxgears - es2_info | egrep "GL_VERSION|GL_RENDERER" - es2gears_x11 + eval $__glxinfo_cmd + eval $__glxgears_cmd + eval $__es2info_cmd + eval $__es2gears_cmd # Smoke test DOTA2 unset LD_LIBRARY_PATH unset LIBGL_DRIVERS_PATH -- 2.30.2