docs: Drop references to LIBGL_DRIVERS_PATH

Fixes: 93511c1c5c ("gbm: link directly with libgallium")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11556
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30456>
This commit is contained in:
Matt Turner 2024-07-31 23:37:07 -04:00 committed by Marge Bot
parent cbf07628bc
commit 66243e6999
5 changed files with 4 additions and 15 deletions

View File

@ -315,7 +315,7 @@ with the IR:
.. code-block:: sh .. code-block:: sh
~/shader-db$ AGX_MESA_DEBUG=shaders,shaderdb ASAHI_MESA_DEBUG=precompile LIBGL_DRIVERS_PATH=~/lib/dri/ LD_PRELOAD=~/mesa/build/src/asahi/drm-shim/libasahi_noop_drm_shim.so ./run shaders/glmark/1-12.shader_test ~/shader-db$ AGX_MESA_DEBUG=shaders,shaderdb ASAHI_MESA_DEBUG=precompile LD_PRELOAD=~/mesa/build/src/asahi/drm-shim/libasahi_noop_drm_shim.so ./run shaders/glmark/1-12.shader_test
The drm-shim implementation for Asahi is located in ``src/asahi/drm-shim``. The The drm-shim implementation for Asahi is located in ``src/asahi/drm-shim``. The
drm-shim implementation there should be updated as new UABI is added. drm-shim implementation there should be updated as new UABI is added.

View File

@ -18,9 +18,7 @@ To build Mesa with Panfrost drm-shim, configure Meson with
building section for a full invocation. The drm-shim binary will be built to building section for a full invocation. The drm-shim binary will be built to
``build/src/panfrost/drm-shim/libpanfrost_noop_drm_shim.so``. ``build/src/panfrost/drm-shim/libpanfrost_noop_drm_shim.so``.
To use, set the ``LD_PRELOAD`` environment variable to the drm-shim binary. It To use, set the ``LD_PRELOAD`` environment variable to the drm-shim binary.
may also be necessary to set ``LIBGL_DRIVERS_PATH`` to the location where Mesa
was installed.
By default, drm-shim mocks a Mali-G52 system. To select a specific Mali GPU, By default, drm-shim mocks a Mali-G52 system. To select a specific Mali GPU,
set the ``PAN_GPU_ID`` environment variable to the desired GPU ID: set the ``PAN_GPU_ID`` environment variable to the desired GPU ID:
@ -45,7 +43,6 @@ build directory is ``~/mesa/build``, a shader can be compiled for Mali-G52 as:
.. code-block:: sh .. code-block:: sh
~/shader-db$ BIFROST_MESA_DEBUG=shaders \ ~/shader-db$ BIFROST_MESA_DEBUG=shaders \
LIBGL_DRIVERS_PATH=~/lib/dri/ \
LD_PRELOAD=~/mesa/build/src/panfrost/drm-shim/libpanfrost_noop_drm_shim.so \ LD_PRELOAD=~/mesa/build/src/panfrost/drm-shim/libpanfrost_noop_drm_shim.so \
PAN_GPU_ID=7212 \ PAN_GPU_ID=7212 \
./run shaders/glmark/1-1.shader_test ./run shaders/glmark/1-1.shader_test
@ -55,7 +52,6 @@ The same shader can be compiled for Mali-T720 as:
.. code-block:: sh .. code-block:: sh
~/shader-db$ MIDGARD_MESA_DEBUG=shaders \ ~/shader-db$ MIDGARD_MESA_DEBUG=shaders \
LIBGL_DRIVERS_PATH=~/lib/dri/ \
LD_PRELOAD=~/mesa/build/src/panfrost/drm-shim/libpanfrost_noop_drm_shim.so \ LD_PRELOAD=~/mesa/build/src/panfrost/drm-shim/libpanfrost_noop_drm_shim.so \
PAN_GPU_ID=720 \ PAN_GPU_ID=720 \
./run shaders/glmark/1-1.shader_test ./run shaders/glmark/1-1.shader_test
@ -75,7 +71,6 @@ although it requires a specially built CTS:
.. code-block:: sh .. code-block:: sh
~/VK-GL-CTS/build/external/openglcts/modules$ PAN_MESA_DEBUG=trace,dump \ ~/VK-GL-CTS/build/external/openglcts/modules$ PAN_MESA_DEBUG=trace,dump \
LIBGL_DRIVERS_PATH=~/lib/dri/ \
LD_PRELOAD=~/mesa/build/src/panfrost/drm-shim/libpanfrost_noop_drm_shim.so \ LD_PRELOAD=~/mesa/build/src/panfrost/drm-shim/libpanfrost_noop_drm_shim.so \
PAN_GPU_ID=7212 EGL_PLATFORM=surfaceless \ PAN_GPU_ID=7212 EGL_PLATFORM=surfaceless \
./glcts --deqp-surface-type=pbuffer \ ./glcts --deqp-surface-type=pbuffer \

View File

@ -13,10 +13,6 @@ LibGL environment variables
If defined debug information will be printed to stderr. If set to If defined debug information will be printed to stderr. If set to
``verbose`` additional information will be printed. ``verbose`` additional information will be printed.
.. envvar:: LIBGL_DRIVERS_PATH
colon-separated list of paths to search for DRI drivers
.. envvar:: LIBGL_ALWAYS_INDIRECT .. envvar:: LIBGL_ALWAYS_INDIRECT
if set to ``true``, forces an indirect rendering context/connection. if set to ``true``, forces an indirect rendering context/connection.

View File

@ -248,8 +248,8 @@ option. For example:
meson --prefix="${PWD}/build/install" build/ meson --prefix="${PWD}/build/install" build/
will put the final libraries and drivers into the build/install/ will put the final libraries and drivers into the build/install/
directory. Then you can set LD_LIBRARY_PATH and LIBGL_DRIVERS_PATH to directory. Then you can set LD_LIBRARY_PATH to that location to run/test
that location to run/test the driver. the driver.
Meson also honors ``DESTDIR`` for installs. Meson also honors ``DESTDIR`` for installs.

View File

@ -262,7 +262,6 @@ Here is one solution:
__es2gears_cmd='es2gears_x11 2>&1 | grep -v "configuration file"' __es2gears_cmd='es2gears_x11 2>&1 | grep -v "configuration file"'
test "x$LD_LIBRARY_PATH" != 'x' && __old_ld="$LD_LIBRARY_PATH" test "x$LD_LIBRARY_PATH" != 'x' && __old_ld="$LD_LIBRARY_PATH"
export LD_LIBRARY_PATH=`pwd`/test/usr/local/lib/:"${__old_ld}" export LD_LIBRARY_PATH=`pwd`/test/usr/local/lib/:"${__old_ld}"
export LIBGL_DRIVERS_PATH=`pwd`/test/usr/local/lib/dri/
export LIBGL_DEBUG=verbose export LIBGL_DEBUG=verbose
eval $__glxinfo_cmd eval $__glxinfo_cmd
eval $__glxgears_cmd eval $__glxgears_cmd
@ -282,7 +281,6 @@ Here is one solution:
# Smoke test DOTA2 # Smoke test DOTA2
unset LD_LIBRARY_PATH unset LD_LIBRARY_PATH
test "x$__old_ld" != 'x' && export LD_LIBRARY_PATH="$__old_ld" && unset __old_ld test "x$__old_ld" != 'x' && export LD_LIBRARY_PATH="$__old_ld" && unset __old_ld
unset LIBGL_DRIVERS_PATH
unset LIBGL_DEBUG unset LIBGL_DEBUG
unset LIBGL_ALWAYS_SOFTWARE unset LIBGL_ALWAYS_SOFTWARE
unset GALLIUM_DRIVER unset GALLIUM_DRIVER