Merge commit 'origin/master' into glsl-pp-rework-2

Conflicts:
	src/gallium/winsys/gdi/SConscript

3 files changed, 9 insertions, 0 deletions

diff --git a/docs/relnotes-7.5.2.html b/docs/relnotes-7.5.2.html
index 32100142c0..b638c0517d 100644
--- a/docs/relnotes-7.5.2.html
+++ b/docs/relnotes-7.5.2.html
@@ -45,6 +45,10 @@ tbd
 <ul>
 <li>Assorted bug fixes for i965/i945 drivers
 <li>Fixed Gallium glDrawPixels(GL_STENCIL_INDEX) failure.
+<li>Fixed GLSL linker/preprocessor version directive issue seen in Wine
+    (such as bug 23946)
+<li>glUseProgram() is now compiled into display lists (bug 23746).
+<li>glUniform functions are now compiled into display lists
 </ul>
 
 
diff --git a/docs/relnotes-7.6.html b/docs/relnotes-7.6.html
index 8a476378e8..9cd3417e7e 100644
--- a/docs/relnotes-7.6.html
+++ b/docs/relnotes-7.6.html
@@ -57,6 +57,10 @@ This was written by Zack Rusin at Tungsten Graphics.
     GL_ARB_fragment_program.</li>
 <li>Added configure --with-max-width=W, --with-max-height=H options to specify
     max framebuffer, viewport size.
+<li>Initial version of Gallium llvmpipe driver.  This is a new driver based
+    on LLVM which makes exensive use of run-time code generation.  This is
+    an "alpha" stage driver.  See the src/gallium/drivers/llvmpipe/README
+    file for more information.
 </ul>
 
 
diff --git a/docs/relnotes-7.7.html b/docs/relnotes-7.7.html
index 755e8ac520..ca6ec55b60 100644
--- a/docs/relnotes-7.7.html
+++ b/docs/relnotes-7.7.html
@@ -37,6 +37,7 @@ tbd
 <li>GL_ARB_draw_elements_base_vertex (supported in Intel i965 and software drivers)</li>
 <li>GL_ARB_depth_clamp (supported in Intel i965 DRI and software drivers)</li>
 <li>GL_NV_depth_clamp (supported in Intel i965 DRI and software drivers)</li>
+<li>GL_ARB_provoking_vertex (same as GL_EXT_provoking_vertex)</li>
 </ul>