From 4042ec939a2cdc8473479c900871c4c8c0b4e818 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 26 Nov 2013 08:05:44 +0100
Subject: xkeyboard-config mesa git update 26 nov 2013

xkeyboard-config commit aaf4edebf7de3c2b5188a4f25a8901d274ea3400
mesa             commit ddc77c5092b6f782327a7014b320f31f5f4e8e93
---
 mesalib/docs/GL3.txt            |  4 ++--
 mesalib/docs/envvars.html       | 36 ++++++++++++++++++++++++++++++++----
 mesalib/docs/llvmpipe.html      |  3 ++-
 mesalib/docs/relnotes/10.1.html |  1 +
 mesalib/docs/shading.html       |  2 +-
 5 files changed, 38 insertions(+), 8 deletions(-)

(limited to 'mesalib/docs')

diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt
index 5f6fa7e80..059ae9840 100644
--- a/mesalib/docs/GL3.txt
+++ b/mesalib/docs/GL3.txt
@@ -97,7 +97,7 @@ GL 4.0:
   GLSL 4.0                                             not started
   GL_ARB_texture_query_lod                             DONE (i965)
   GL_ARB_draw_buffers_blend                            DONE (i965, r600, radeonsi, softpipe)
-  GL_ARB_draw_indirect                                 started (Christoph)
+  GL_ARB_draw_indirect                                 DONE (i965)
   GL_ARB_gpu_shader5                                   started
   GL_ARB_gpu_shader_fp64                               not started
   GL_ARB_sample_shading                                DONE (i965)
@@ -151,7 +151,7 @@ GL 4.3:
   GL_ARB_framebuffer_no_attachments                    not started
   GL_ARB_internalformat_query2                         not started
   GL_ARB_invalidate_subdata                            DONE (all drivers)
-  GL_ARB_multi_draw_indirect                           not started
+  GL_ARB_multi_draw_indirect                           DONE (i965)
   GL_ARB_program_interface_query                       not started
   GL_ARB_robust_buffer_access_behavior                 not started
   GL_ARB_shader_image_size                             not started
diff --git a/mesalib/docs/envvars.html b/mesalib/docs/envvars.html
index 67d8e292b..3cc3c8096 100644
--- a/mesalib/docs/envvars.html
+++ b/mesalib/docs/envvars.html
@@ -121,10 +121,38 @@ See the <a href="xlibdriver.html">Xlib software driver page</a> for details.
 <h2>i945/i965 driver environment variables (non-Gallium)</h2>
 
 <ul>
-<li>INTEL_STRICT_CONFORMANCE - if set to 1, enable sw fallbacks to improve
-    OpenGL conformance.  If set to 2, always use software rendering.
-<li>INTEL_NO_BLIT - if set, disable hardware-accelerated glBitmap,
-    glCopyPixels, glDrawPixels.
+<li>INTEL_NO_HW - if set to 1, prevents batches from being submitted to the hardware.
+   This is useful for debugging hangs, etc.</li>
+<li>INTEL_DEBUG - a comma-separated list of named flags, which do various things:
+<ul>
+   <li>tex - emit messages about textures.</li>
+   <li>state - emit messages about state flag tracking</li>
+   <li>blit - emit messages about blit operations</li>
+   <li>miptree - emit messages about miptrees</li>
+   <li>perf - emit messages about performance issues</li>
+   <li>perfmon - emit messages about AMD_performance_monitor</li>
+   <li>bat - emit batch information</li>
+   <li>pix - emit messages about pixel operations</li>
+   <li>buf - emit messages about buffer objects</li>
+   <li>reg - emit messages about regions</li>
+   <li>fbo - emit messages about framebuffers</li>
+   <li>fs - dump shader assembly for fragment shaders</li>
+   <li>gs - dump shader assembly for geometry shaders</li>
+   <li>sync - emit messages about synchronization</li>
+   <li>prim - emit messages about drawing primitives</li>
+   <li>vert - emit messages about vertex assembly</li>
+   <li>dri - emit messages about the DRI interface</li>
+   <li>sf - emit messages about the strips &amp; fans unit (for old gens, includes the SF program)</li>
+   <li>stats - enable statistics counters. you probably actually want perfmon or intel_gpu_top instead.</li>
+   <li>urb - emit messages about URB setup</li>
+   <li>vs - dump shader assembly for vertex shaders</li>
+   <li>clip - emit messages about the clip unit (for old gens, includes the CLIP program)</li>
+   <li>aub - dump batches into an AUB trace for use with simulation tools</li>
+   <li>shader_time - record how much GPU time is spent in each shader</li>
+   <li>no16 - suppress generation of 16-wide fragment shaders. useful for debugging broken shaders</li>
+   <li>blorp - emit messages about the blorp operations (blits &amp; clears)</li>
+   <li>nodualobj - suppress generation of dual-object geometry shader code</li>
+</ul>
 </ul>
 
 
diff --git a/mesalib/docs/llvmpipe.html b/mesalib/docs/llvmpipe.html
index d69590726..74f0c67d8 100644
--- a/mesalib/docs/llvmpipe.html
+++ b/mesalib/docs/llvmpipe.html
@@ -255,8 +255,9 @@ for posterior analysis, e.g.:
     </ul>
   </li>
   <li>
-    <p>Misc</p>
+    <p>General</p>
     <ul>
+      <li><a href="http://fgiesen.wordpress.com/2011/07/09/a-trip-through-the-graphics-pipeline-2011-index/">A trip through the Graphics Pipeline</a></li>
       <li><a href="http://msdn.microsoft.com/en-us/library/gg615082.aspx#architecture">WARP Architecture and Performance</a></li>
     </ul>
   </li>
diff --git a/mesalib/docs/relnotes/10.1.html b/mesalib/docs/relnotes/10.1.html
index 55d810f31..1b8ea22f8 100644
--- a/mesalib/docs/relnotes/10.1.html
+++ b/mesalib/docs/relnotes/10.1.html
@@ -44,6 +44,7 @@ Note: some of the new features are only available with certain drivers.
 </p>
 
 <ul>
+<li>GL_ARB_draw_indirect on i965.</li>
 </ul>
 
 
diff --git a/mesalib/docs/shading.html b/mesalib/docs/shading.html
index 19e20b183..4015cdf2e 100644
--- a/mesalib/docs/shading.html
+++ b/mesalib/docs/shading.html
@@ -67,7 +67,7 @@ Example:  export MESA_GLSL=dump,nopt
 <h2 id="support">GLSL Version</h2>
 
 <p>
-The GLSL compiler currently supports version 1.40 of the shading language.
+The GLSL compiler currently supports version 3.30 of the shading language.
 </p>
 
 <p>
-- 
cgit v1.2.3