aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/get.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-09-20 11:47:27 +0200
committermarha <marha@users.sourceforge.net>2013-09-20 11:47:27 +0200
commit55c05b8a12944349b00053253d3a49b223a9f4de (patch)
treeffa9a1d19efffd67daca5f1568fc2394fdbe0534 /mesalib/src/mesa/main/get.c
parent7f669a708bd35bdf8e842f762ec68f9ad0ec0486 (diff)
downloadvcxsrv-55c05b8a12944349b00053253d3a49b223a9f4de.tar.gz
vcxsrv-55c05b8a12944349b00053253d3a49b223a9f4de.tar.bz2
vcxsrv-55c05b8a12944349b00053253d3a49b223a9f4de.zip
fontconfig mesa pixman git update 20 Sep 2013
pixman commit aa5c45254eb60ce4c85a25b5343474fb160ffa7c fontconfig commit 643f8088f0d51107e58d142df47124efec6afab1 mesa commit 1cc3b90d47f92aa0be2d914191fd2f46d2b127d7
Diffstat (limited to 'mesalib/src/mesa/main/get.c')
-rw-r--r--mesalib/src/mesa/main/get.c13
1 files changed, 10 insertions, 3 deletions
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;