From 8f24a14175b7175b73c3c5f91c7700163c75f484 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Mon, 28 Sep 2020 13:49:20 +0200 Subject: [PATCH] docs: gallium -> Gallium Reviewed-by: Eric Anholt Part-of: --- docs/codingstyle.rst | 2 +- docs/index.rst | 4 ++-- docs/osmesa.rst | 2 +- docs/sourcetree.rst | 2 +- docs/viewperf.rst | 2 +- docs/vmware-guest.rst | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/codingstyle.rst b/docs/codingstyle.rst index 198289a..ab479e2 100644 --- a/docs/codingstyle.rst +++ b/docs/codingstyle.rst @@ -112,7 +112,7 @@ Basic formatting guidelines - Constants, macros and enum names are ``ALL_UPPERCASE``, with \_ between words. - Mesa usually uses camel case for local variables (Ex: - ``localVarname``) while gallium typically uses underscores (Ex: + ``localVarname``) while Gallium typically uses underscores (Ex: ``local_var_name``). - Global variables are almost never used because Mesa should be thread-safe. diff --git a/docs/index.rst b/docs/index.rst index ba8e1da..1278199 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -108,13 +108,13 @@ February 2012: Mesa 8.0 is released, implementing the OpenGL 3.0 specification and version 1.30 of the OpenGL Shading Language. July 2016: Mesa 12.0 is released, including OpenGL 4.3 support and -initial support for Vulkan for Intel GPUs. Plus, there's another gallium +initial support for Vulkan for Intel GPUs. Plus, there's another Gallium software driver ("swr") based on LLVM and developed by Intel. Ongoing: Mesa is the OpenGL implementation for devices designed by Intel, AMD, NVIDIA, Qualcomm, Broadcom, Vivante, plus the VMware and VirGL virtual GPUs. There's also several software-based renderers: -swrast (the legacy Mesa rasterizer), softpipe (a gallium reference +swrast (the legacy Mesa rasterizer), softpipe (a Gallium reference driver), llvmpipe (LLVM/JIT-based high-speed rasterizer) and swr (another LLVM-based driver). diff --git a/docs/osmesa.rst b/docs/osmesa.rst index 0232aec..48bf65e 100644 --- a/docs/osmesa.rst +++ b/docs/osmesa.rst @@ -37,7 +37,7 @@ When the build is complete you should find: :: $PWD/builddir/install/lib/libOSMesa.so (swrast-based OSMesa) - $PWD/builddir/install/lib/gallium/libOSMsea.so (gallium-based OSMesa) + $PWD/builddir/install/lib/gallium/libOSMsea.so (Gallium-based OSMesa) Set your LD_LIBRARY_PATH to point to $PWD/builddir/install to use the libraries diff --git a/docs/sourcetree.rst b/docs/sourcetree.rst index dd6fe43..a9d752a 100644 --- a/docs/sourcetree.rst +++ b/docs/sourcetree.rst @@ -195,7 +195,7 @@ each directory. - **d3dadapter9** - d3dadapter9.so for Wine - **dri** - libgallium_dri.so loaded by libGL.so - - **graw** - raw gallium interface without a frontend + - **graw** - raw Gallium interface without a frontend - XXX more - **glx** - The GLX library code for building libGL.so using DRI diff --git a/docs/viewperf.rst b/docs/viewperf.rst index 30957cb..ae3c4e4 100644 --- a/docs/viewperf.rst +++ b/docs/viewperf.rst @@ -185,7 +185,7 @@ If either of the two passes happen to use a software fallback of some sort, the Z values of fragments may be different between the two passes. This leads to incorrect rendering. -For example, the VMware SVGA gallium driver uses a special semi-fallback +For example, the VMware SVGA Gallium driver uses a special semi-fallback path for drawing with polygon stipple. Since the two passes are rendered with different vertex transformation implementations, the rendering doesn't appear as expected. Setting the SVGA_FORCE_SWTNL environment diff --git a/docs/vmware-guest.rst b/docs/vmware-guest.rst index d738f2b..ba713a7 100644 --- a/docs/vmware-guest.rst +++ b/docs/vmware-guest.rst @@ -15,7 +15,7 @@ supported in the guest. This requires: - The host OS, GPU and graphics driver supports DX11 (Windows) or OpenGL 4.0 (Linux, Mac) - On Linux, the vmwgfx kernel module must be version 2.9.0 or later. -- A recent version of Mesa with the updated svga gallium driver. +- A recent version of Mesa with the updated svga Gallium driver. Otherwise, OpenGL 2.1 is supported. @@ -58,7 +58,7 @@ The components involved in this include: - Linux kernel module: vmwgfx - X server 2D driver: xf86-video-vmware - User-space libdrm library -- Mesa/gallium OpenGL driver: "svga" +- Mesa/Gallium OpenGL driver: "svga" All of these components reside in the guest Linux virtual machine. On the host, all you're doing is running VMware -- 2.7.4