From 55c05b8a12944349b00053253d3a49b223a9f4de Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 20 Sep 2013 11:47:27 +0200
Subject: fontconfig mesa pixman git update 20 Sep 2013

pixman           commit aa5c45254eb60ce4c85a25b5343474fb160ffa7c
fontconfig       commit 643f8088f0d51107e58d142df47124efec6afab1
mesa             commit 1cc3b90d47f92aa0be2d914191fd2f46d2b127d7
---
 mesalib/src/mesa/main/get.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'mesalib/src/mesa/main/get.c')

diff --git a/mesalib/src/mesa/main/get.c b/mesalib/src/mesa/main/get.c
index 4f6f59ae6..7af5f5591 100644
--- a/mesalib/src/mesa/main/get.c
+++ b/mesalib/src/mesa/main/get.c
@@ -396,6 +396,12 @@ static const int extra_gl32_es3[] = {
     EXTRA_END,
 };
 
+static const int extra_gl32_ARB_geometry_shader4[] = {
+    EXTRA_VERSION_32,
+    EXT(ARB_geometry_shader4),
+    EXTRA_END
+};
+
 static const int
 extra_ARB_vertex_program_api_es2[] = {
    EXT(ARB_vertex_program),
@@ -502,7 +508,9 @@ print_table_stats(int api)
 void _mesa_init_get_hash(struct gl_context *ctx)
 {
 #ifdef GET_DEBUG
-   print_table_stats();
+   print_table_stats(ctx->API);
+#else
+   (void) ctx;
 #endif
 }
 
@@ -709,11 +717,10 @@ find_custom_value(struct gl_context *ctx, const struct value_desc *d, union valu
    case GL_COMPRESSED_TEXTURE_FORMATS_ARB:
       v->value_int_n.n = 
 	 _mesa_get_compressed_formats(ctx, v->value_int_n.ints);
-      ASSERT(v->value_int_n.n <= ARRAY_SIZE(v->value_int_n.ints));
+      ASSERT(v->value_int_n.n <= (int) ARRAY_SIZE(v->value_int_n.ints));
       break;
 
    case GL_MAX_VARYING_FLOATS_ARB:
-   case GL_MAX_FRAGMENT_INPUT_COMPONENTS:
       v->value_int = ctx->Const.MaxVarying * 4;
       break;
 
-- 
cgit v1.2.3