9 files changed, 38 insertions, 2 deletions
diff --git a/fontconfig/src/makefile b/fontconfig/src/makefile
index 25130f82f..4ef9be83d 100755
--- a/fontconfig/src/makefile
+++ b/fontconfig/src/makefile
@@ -27,7 +27,6 @@ CSRCS = \
 	fcformat.c \
 	fcfreetype.c \
 	fcfs.c \
-	fchash.c \
 	fcinit.c \
 	fclang.c \
 	fclist.c \
diff --git a/freetype/freetype.vcxproj b/freetype/freetype.vcxproj
index be19aacca..dfb5e1473 100755
--- a/freetype/freetype.vcxproj
+++ b/freetype/freetype.vcxproj
@@ -380,6 +380,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="src\autofit\afangles.c" />
+    <ClCompile Include="src\autofit\afblue.c" />
     <ClCompile Include="src\autofit\afcjk.c" />
     <ClCompile Include="src\autofit\afdummy.c" />
     <ClCompile Include="src\autofit\afglobal.c">
@@ -391,6 +392,8 @@
     <ClCompile Include="src\autofit\aflatin.c" />
     <ClCompile Include="src\autofit\afloader.c" />
     <ClCompile Include="src\autofit\afmodule.c" />
+    <ClCompile Include="src\autofit\afranges.c" />
+    <ClCompile Include="src\autofit\hbshim.c" />
     <ClCompile Include="src\base\ftbitmap.c" />
     <ClCompile Include="src\base\ftlcdfil.c" />
     <ClCompile Include="src\base\ftsynth.c" />
diff --git a/freetype/freetype.vcxproj.filters b/freetype/freetype.vcxproj.filters
index a640676fa..528fb460f 100644
--- a/freetype/freetype.vcxproj.filters
+++ b/freetype/freetype.vcxproj.filters
@@ -200,6 +200,15 @@
     <ClCompile Include="src\pcf\pcfutil.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\autofit\hbshim.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\autofit\afblue.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\autofit\afranges.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\freetype\freetype.h">
diff --git a/include/xcb/xcb.h b/include/xcb/xcb.h
index ec5cd3301..b180be8ef 100644
--- a/include/xcb/xcb.h
+++ b/include/xcb/xcb.h
@@ -458,7 +458,8 @@ int xcb_get_file_descriptor(xcb_connection_t *c);
  * Some errors that occur in the context of an xcb_connection_t
  * are unrecoverable. When such an error occurs, the
  * connection is shut down and further operations on the
- * xcb_connection_t have no effect.
+ * xcb_connection_t have no effect, but memory will not be freed until
+ * xcb_disconnect() is called on the xcb_connection_t.
  *
  * @return XCB_CONN_ERROR, because of socket errors, pipe errors or other stream errors.
  * @return XCB_CONN_CLOSED_EXT_NOTSUPPORTED, when extension not supported.
@@ -480,6 +481,11 @@ int xcb_connection_has_error(xcb_connection_t *c);
  * bidirectionally connected to an X server. If the connection
  * should be unauthenticated, @p auth_info must be @c
  * NULL.
+ *
+ * Always returns a non-NULL pointer to a xcb_connection_t, even on failure.
+ * Callers need to use xcb_connection_has_error() to check for failure.
+ * When finished, use xcb_disconnect() to close the connection and free
+ * the structure.
  */
 xcb_connection_t *xcb_connect_to_fd(int fd, xcb_auth_info_t *auth_info);
 
@@ -525,6 +531,11 @@ int xcb_parse_display(const char *name, char **host, int *display, int *screen);
  * variable. If a particular screen on that server is preferred, the
  * int pointed to by @p screenp (if not @c NULL) will be set to that
  * screen; otherwise the screen will be set to 0.
+ *
+ * Always returns a non-NULL pointer to a xcb_connection_t, even on failure.
+ * Callers need to use xcb_connection_has_error() to check for failure.
+ * When finished, use xcb_disconnect() to close the connection and free
+ * the structure.
  */
 xcb_connection_t *xcb_connect(const char *displayname, int *screenp);
 
@@ -539,6 +550,11 @@ xcb_connection_t *xcb_connect(const char *displayname, int *screenp);
  * authorization @p auth. If a particular screen on that server is
  * preferred, the int pointed to by @p screenp (if not @c NULL) will
  * be set to that screen; otherwise @p screenp will be set to 0.
+ *
+ * Always returns a non-NULL pointer to a xcb_connection_t, even on failure.
+ * Callers need to use xcb_connection_has_error() to check for failure.
+ * When finished, use xcb_disconnect() to close the connection and free
+ * the structure.
  */
 xcb_connection_t *xcb_connect_to_display_with_auth_info(const char *display, xcb_auth_info_t *auth, int *screen);
 
diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
index 59452a242..3bfc5cefa 100644
--- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
+++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
@@ -248,6 +248,7 @@
     <ClCompile Include="..\..\..\..\src\glsl\opt_function_inlining.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\opt_if_simplification.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\opt_noop_swizzle.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\opt_rebalance_tree.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\opt_redundant_jumps.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\opt_structure_splitting.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\opt_swizzle_swizzle.cpp" />
diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters
index fb393a579..98d29eee7 100644
--- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters
+++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters
@@ -303,6 +303,9 @@
     <ClCompile Include="..\..\..\..\src\glsl\opt_vectorize.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\opt_rebalance_tree.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\src\glsl\strtod.h">
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
index e63e2c552..4135da13e 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
@@ -287,6 +287,7 @@
     <ClCompile Include="..\..\..\..\src\glsl\opt_function_inlining.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\opt_if_simplification.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\opt_noop_swizzle.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\opt_rebalance_tree.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\opt_redundant_jumps.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\opt_structure_splitting.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\opt_swizzle_swizzle.cpp" />
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
index a7db91a3f..8b3d39cc4 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
@@ -794,6 +794,9 @@
     <ClCompile Include="..\..\..\..\src\mesa\main\pipelineobj.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\opt_rebalance_tree.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\src\glsl\strtod.h">
diff --git a/xorg-server/glx/indirect_size_get.c b/xorg-server/glx/indirect_size_get.c
index 277bcc4b1..9036ec732 100644
--- a/xorg-server/glx/indirect_size_get.c
+++ b/xorg-server/glx/indirect_size_get.c
@@ -603,6 +603,7 @@ __glGetBooleanv_size( GLenum e )
         case GL_RESET_NOTIFICATION_STRATEGY_ARB:
         case GL_MAX_DEBUG_GROUP_STACK_DEPTH:
         case GL_DEBUG_GROUP_STACK_DEPTH:
+        case GL_MAX_UNIFORM_LOCATIONS:
         case GL_MAX_LABEL_LENGTH:
         case GL_CURRENT_FOG_COORD:
         case GL_FOG_COORDINATE_ARRAY_TYPE: