From 7b9a0f4e38b6b64a91ed0e674410af962b390120 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vedran=20Mileti=C4=87?= Date: Thu, 14 Jul 2016 12:17:21 +0200 Subject: [PATCH] mesa: standardize naming Mesa3D, MESA -> Mesa MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Vedran Miletić Reviewed-by: Edward O'Callaghan --- docs/xlibdriver.html | 2 +- src/gallium/docs/source/drivers/openswr/faq.rst | 4 ++-- src/gallium/include/pipe/p_defines.h | 2 +- src/mesa/main/version.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/xlibdriver.html b/docs/xlibdriver.html index d3d8ab4..fc8c201 100644 --- a/docs/xlibdriver.html +++ b/docs/xlibdriver.html @@ -199,7 +199,7 @@ This incurs a small performance penalty.

Extensions

-The following MESA-specific extensions are implemented in the Xlib driver. +The following Mesa-specific extensions are implemented in the Xlib driver.

GLX_MESA_pixmap_colormap

diff --git a/src/gallium/docs/source/drivers/openswr/faq.rst b/src/gallium/docs/source/drivers/openswr/faq.rst index 596d77f..1d058f9 100644 --- a/src/gallium/docs/source/drivers/openswr/faq.rst +++ b/src/gallium/docs/source/drivers/openswr/faq.rst @@ -5,7 +5,7 @@ Why another software rasterizer? -------------------------------- Good question, given there are already three (swrast, softpipe, -llvmpipe) in the Mesa3D tree. Two important reasons for this: +llvmpipe) in the Mesa tree. Two important reasons for this: * Architecture - given our focus on scientific visualization, our workloads are much different than the typical game; we have heavy @@ -16,7 +16,7 @@ llvmpipe) in the Mesa3D tree. Two important reasons for this: * Historical - Intel had developed a high performance software graphics stack for internal purposes. Later we adapted this graphics stack for use in visualization and decided to move forward - with Mesa3D to provide a high quality API layer while at the same + with Mesa to provide a high quality API layer while at the same time benefiting from the excellent performance the software rasterizerizer gives us. diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index 2524e42..8655814 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -278,7 +278,7 @@ enum pipe_transfer_usage * * See also: * - Direct3D's D3DLOCK_DONOTWAIT flag. - * - Mesa3D's MESA_MAP_NOWAIT_BIT flag. + * - Mesa's MESA_MAP_NOWAIT_BIT flag. * - WDDM's D3DDDICB_LOCKFLAGS.DonotWait flag. */ PIPE_TRANSFER_DONTBLOCK = (1 << 9), diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c index 7138cf3..cc4416d 100644 --- a/src/mesa/main/version.c +++ b/src/mesa/main/version.c @@ -111,7 +111,7 @@ exit: } /** - * Builds the MESA version string. + * Builds the Mesa version string. */ static void create_version_string(struct gl_context *ctx, const char *prefix) -- 2.7.4