From eef864d36de97903007f04fad9fa43afe297745b Mon Sep 17 00:00:00 2001
From: marha
Date: Fri, 25 May 2012 15:19:41 +0200
Subject: fontconfig xserver xkeyboard-config pixman git update 2012
---
mesalib/docs/GL3.txt | 4 ++--
mesalib/docs/dispatch.html | 2 +-
mesalib/docs/relnotes.html | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
(limited to 'mesalib/docs')
diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt
index 5fc6c69ba..17136de31 100644
--- a/mesalib/docs/GL3.txt
+++ b/mesalib/docs/GL3.txt
@@ -46,7 +46,7 @@ GLSL 1.40 missing: UBOS, inverse(),
highp change
Instanced drawing (GL_ARB_draw_instanced) DONE (i965, gallium, swrast)
Buffer copying (GL_ARB_copy_buffer) DONE (i965, r300, r600, swrast)
-Primitive restart (GL_NV_primitive_restart) DONE (r600)
+Primitive restart (GL_NV_primitive_restart) DONE (i965, r600)
16 vertex texture image units DONE
Texture buffer objs (GL_ARB_texture_buffer_object) needs GL3.1 enabling (i965)
Rectangular textures (GL_ARB_texture_rectangle) DONE (i965, r300, r600, swrast)
@@ -73,7 +73,7 @@ GLX_ARB_create_context_profile DONE
GL 3.3:
GLSL 3.30 not started
-GL_ARB_blend_func_extended DONE (r600, softpipe)
+GL_ARB_blend_func_extended DONE (i965, r600, softpipe)
GL_ARB_explicit_attrib_location DONE (i915, i965, r300, r600, swrast)
GL_ARB_occlusion_query2 DONE (r300, r600, swrast)
GL_ARB_sampler_objects DONE (i965, r300, r600)
diff --git a/mesalib/docs/dispatch.html b/mesalib/docs/dispatch.html
index c3a33b90b..620aecd74 100644
--- a/mesalib/docs/dispatch.html
+++ b/mesalib/docs/dispatch.html
@@ -84,7 +84,7 @@ void glVertex3f(GLfloat x, GLfloat y, GLfloat z)
The problem with this simple implementation is the large amount of
overhead that it adds to every GL function call.
-In a multithreaded environment, a niave implementation of
+
In a multithreaded environment, a naive implementation of
GET_DISPATCH involves a call to pthread_getspecific or a
similar function. Mesa provides a wrapper function called
_glapi_get_dispatch that is used by default.
diff --git a/mesalib/docs/relnotes.html b/mesalib/docs/relnotes.html
index 23337cfd3..1bc889a5b 100644
--- a/mesalib/docs/relnotes.html
+++ b/mesalib/docs/relnotes.html
@@ -13,6 +13,7 @@ The release notes summarize what's new or changed in each Mesa release.