aboutsummaryrefslogtreecommitdiff
path: root/mesalib/docs
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-03-13 08:34:09 +0100
committermarha <marha@users.sourceforge.net>2012-03-13 08:34:09 +0100
commit7d894e32566b710952c44cbc71939ad1d9e2fa8d (patch)
tree2c324c18b71f48bcb8bb2c4c35fa0fce1b02a5fb /mesalib/docs
parent96276c847a5c266f9f51f3ec4ece8fe3f1381c96 (diff)
parentfc72edebf875378459368c5383d9023730cbca54 (diff)
downloadvcxsrv-7d894e32566b710952c44cbc71939ad1d9e2fa8d.tar.gz
vcxsrv-7d894e32566b710952c44cbc71939ad1d9e2fa8d.tar.bz2
vcxsrv-7d894e32566b710952c44cbc71939ad1d9e2fa8d.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/docs')
-rw-r--r--mesalib/docs/autoconf.html98
-rw-r--r--mesalib/docs/xlibdriver.html2
2 files changed, 38 insertions, 62 deletions
diff --git a/mesalib/docs/autoconf.html b/mesalib/docs/autoconf.html
index 895cf665c..07a966e05 100644
--- a/mesalib/docs/autoconf.html
+++ b/mesalib/docs/autoconf.html
@@ -1,4 +1,4 @@
-<html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" ><html LANG=en>
<title>Compilation and Installation using Autoconf</title>
@@ -10,23 +10,22 @@
<h1>Compilation and Installation using Autoconf</h1>
<ol>
-<li><a href="#basic">Basic Usage</a></li>
-<li><a href="#driver">Driver Options</a></li>
+<li><p ><a href="#basic">Basic Usage</a></li>
+<li><p ><a href="#driver">Driver Options</a>
<ul>
<li><a href="#xlib">Xlib Driver Options</a></li>
<li><a href="#dri">DRI Driver Options</a></li>
<li><a href="#osmesa">OSMesa Driver Options</a></li>
</ul>
-<li><a href="#library">Library Options</a></li>
+<li><p ><a href="#library">Library Options</a>
<ul>
<li><a href="#glu">GLU</a></li>
</ul>
-<li><a href="#demos">Demo Program Options</a></li>
+<li><p ><a href="#demos">Demo Program Options</a>
</ol>
-<a name="basic">
-<h2>1. Basic Usage</h2>
+<h2 id="basic">1. Basic Usage</h2>
<p>
The autoconf generated configure script can be used to guess your
@@ -104,7 +103,6 @@ package metadata in <code>/usr/X11R6</code> before the standard
directories.
</li>
</ul>
-</p>
<p>
There are also a few general options for altering the Mesa build:
@@ -139,11 +137,9 @@ to force 32- or 64-bit code generation as used on the x86 and x86_64
architectures.
</li>
</ul>
-</p>
-<a name="driver">
-<h2>2. Driver Options</h2>
+<h2 id="driver">2. Driver Options</h2>
<p>
There are several different driver modes that Mesa can use. These are
@@ -153,84 +149,70 @@ configure option --with-driver. There are currently three supported
options in the configure script.
</p>
-<ul>
-
-<a name="xlib">
-<li><b><em>Xlib</em></b> - This is the default mode for building Mesa.
+<h3 id="xlib">Xlib</h3 ><p >This is the default mode for building Mesa.
It uses Xlib as a software renderer to do all rendering. It corresponds
to the option <code>--with-driver=xlib</code>. The libX11 and libXext
libraries, as well as the X11 development headers, will be need to
support the Xlib driver.
-</li>
-<a name="dri">
-<li><b><em>DRI</em></b> - This mode uses the DRI hardware drivers for
+<h3 id="dri">DRI </h3 ><p >This mode uses the DRI hardware drivers for
accelerated OpenGL rendering. Enable the DRI drivers with the option
<code>--with-driver=dri</code>. See the <a href="install.html">basic
installation instructions</a> for details on prerequisites for the DRI
drivers.
-</li>
<!-- DRI specific options -->
-<p>
-<ul>
-<li><code>--with-dri-driverdir=DIR</code> - This option specifies the
+<dl>
+<dt><code>--with-dri-driverdir=DIR</code>
+<dd ><p > This option specifies the
location the DRI drivers will be installed to and the location libGL
will search for DRI drivers. The default is <code>${libdir}/dri</code>.
-</li>
-<li><code>--with-dri-drivers=DRIVER,DRIVER,...</code> - This option
+<dt><code>--with-dri-drivers=DRIVER,DRIVER,...</code>
+<dd ><p > This option
allows a specific set of DRI drivers to be built. For example,
<code>--with-dri-drivers="swrast,i965,radeon,nouveau"</code>. By
default, the drivers will be chosen depending on the target platform.
See the directory <code>src/mesa/drivers/dri</code> in the source tree
for available drivers. Beware that the swrast DRI driver is used by both
libGL and the X.Org xserver GLX module to do software rendering, so you
-may run into problems if it is not available.</li>
+may run into problems if it is not available.
<!-- This explanation might be totally bogus. Kristian? -->
-<li><code>--disable-driglx-direct</code> - Disable direct rendering in
+<dt><code>--disable-driglx-direct</code>
+<dd ><p > Disable direct rendering in
GLX. Normally, direct hardware rendering through the DRI drivers and
indirect software rendering are enabled in GLX. This option disables
direct rendering entirely. It can be useful on architectures where
kernel DRM modules are not available.
-</li>
-<li><code>--enable-glx-tls</code> - Enable Thread Local Storage (TLS) in
+<dt><code>--enable-glx-tls</code> <dd ><p >
+Enable Thread Local Storage (TLS) in
GLX.
-</li>
-<li><code>--with-expat=DIR</code> - The DRI-enabled libGL uses expat to
+<dt><code>--with-expat=DIR</code> <dd > The DRI-enabled libGL uses expat to
parse the DRI configuration files in <code>/etc/drirc</code> and
<code>~/.drirc</code>. This option allows a specific expat installation
to be used. For example, <code>--with-expat=/usr/local</code> will
search for expat headers and libraries in <code>/usr/local/include</code>
and <code>/usr/local/lib</code>, respectively.
-</li>
-</ul>
-</p>
+</dl>
-<a name="osmesa">
-<li><b><em>OSMesa</em></b> - No libGL is built in this
+<h3 id="osmesa">OSMesa </h3><p> No libGL is built in this
mode. Instead, the driver code is built into the Off-Screen Mesa
(OSMesa) library. See the <a href="osmesa.html">Off-Screen Rendering</a>
page for more details.
-</li>
<!-- OSMesa specific options -->
-<p>
-<ul>
-<li><code>--with-osmesa-bits=BITS</code> - This option allows the size
+<dl>
+<dt><code>--with-osmesa-bits=BITS</code>
+<dd><p> This option allows the size
of the color channel in bits to be specified. By default, an 8-bit
channel will be used, and the driver will be named libOSMesa. Other
options are 16- and 32-bit color channels, which will add the bit size
to the library name. For example, <code>--with-osmesa-bits=16</code>
will create the libOSMesa16 library with a 16-bit color channel.
-</li>
-</ul>
-</p>
-
-</ul>
+</dl>
+</dl>
-<a name="library">
-<h2>3. Library Options</h2>
+<h2 id="library">3. Library Options</h2>
<p>
The configure script provides more fine grained control over the GL
@@ -238,18 +220,14 @@ libraries that will be built. More details on the specific GL libraries
can be found in the <a href="install.html">basic installation
instructions</a>.
-<ul>
-<a name="glu">
-<li><b><em>GLU</em></b> - The libGLU library will be built by default
+<dl>
+<dt id="glu">GLU <dd><p> The libGLU library will be built by default
on all drivers. This can be disable with the option
<code>--disable-glu</code>.
-</li>
-</ul>
-</p>
+</dl>
-<a name="demos">
-<h2>4. Demo Program Options</h2>
+<h2 id="demos">4. Demo Program Options</h2>
<p>
There are many demonstration programs in the MesaDemos tarball. If the
@@ -257,18 +235,16 @@ programs are available when <code>./configure</code> is run, a subset of
the programs will be built depending on the driver and library options
chosen. See the directory <code>progs</code> for the full set of demos.
-<ul>
-<li><code>--with-demos=DEMOS,DEMOS,...</code> - This option allows a
+<dl>
+<dt><code>--with-demos=DEMOS,DEMOS,...</code>
+<dd><p> This option allows a
specific set of demo programs to be built. For example,
<code>--with-demos="xdemos,slang"</code>. Beware that if this option is
used, it will not be ensured that the necessary GL libraries will be
available.
-</li>
-<li><code>--without-demos</code> - This completely disables building the
+<dt><code>--without-demos</code> <dd><p> This completely disables building the
demo programs. It is equivalent to <code>--with-demos=no</code>.
-</li>
-</ul>
-</p>
+</dl>
</body>
</html>
diff --git a/mesalib/docs/xlibdriver.html b/mesalib/docs/xlibdriver.html
index d95f4d579..db03bc353 100644
--- a/mesalib/docs/xlibdriver.html
+++ b/mesalib/docs/xlibdriver.html
@@ -164,7 +164,7 @@ drawn with glDrawPixels.
<p>
For more information about gamma correction see:
-<a href="http://www.inforamp.net/~poynton/notes/colour_and_gamma/GammaFAQ.html"
+<a href="http://www.inforamp.net/~poynton/notes/colour_and_gamma/GammaFAQ.html">
the Gamma FAQ</a>
</p>