aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/get.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-10-31 09:31:38 +0100
committermarha <marha@users.sourceforge.net>2012-10-31 09:31:38 +0100
commit5b22d4d5511efbd4fb0658c370edadd39829e39b (patch)
tree96a36b429ff2a0819653279a5e63a1bed79d4434 /mesalib/src/mesa/main/get.c
parent7bc456b7052b9591a58bfb6b509abb09d5464990 (diff)
parent67c290de36ddc1caae94c0892157ac16b90e4f99 (diff)
downloadvcxsrv-5b22d4d5511efbd4fb0658c370edadd39829e39b.tar.gz
vcxsrv-5b22d4d5511efbd4fb0658c370edadd39829e39b.tar.bz2
vcxsrv-5b22d4d5511efbd4fb0658c370edadd39829e39b.zip
Merge remote-tracking branch 'origin/released'
* origin/released: mesa git update 31 oct 2012
Diffstat (limited to 'mesalib/src/mesa/main/get.c')
-rw-r--r--mesalib/src/mesa/main/get.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/mesalib/src/mesa/main/get.c b/mesalib/src/mesa/main/get.c
index 805f0f978..c34d873f2 100644
--- a/mesalib/src/mesa/main/get.c
+++ b/mesalib/src/mesa/main/get.c
@@ -303,11 +303,9 @@ EXTRA_EXT(EXT_secondary_color);
EXTRA_EXT(EXT_fog_coord);
EXTRA_EXT(NV_fog_distance);
EXTRA_EXT(EXT_texture_filter_anisotropic);
-EXTRA_EXT(IBM_rasterpos_clip);
EXTRA_EXT(NV_point_sprite);
EXTRA_EXT(NV_texture_rectangle);
EXTRA_EXT(EXT_stencil_two_side);
-EXTRA_EXT(NV_light_max_exponent);
EXTRA_EXT(EXT_depth_bounds_test);
EXTRA_EXT(ARB_depth_clamp);
EXTRA_EXT(ATI_fragment_shader);
@@ -319,7 +317,6 @@ EXTRA_EXT(ARB_fragment_program);
EXTRA_EXT2(ARB_framebuffer_object, EXT_framebuffer_multisample);
EXTRA_EXT(EXT_framebuffer_object);
EXTRA_EXT(ARB_seamless_cube_map);
-EXTRA_EXT(EXT_compiled_vertex_array);
EXTRA_EXT(ARB_sync);
EXTRA_EXT(ARB_vertex_shader);
EXTRA_EXT(EXT_transform_feedback);
@@ -331,13 +328,13 @@ EXTRA_EXT2(NV_point_sprite, ARB_point_sprite);
EXTRA_EXT2(ARB_vertex_program, ARB_fragment_program);
EXTRA_EXT(ARB_geometry_shader4);
EXTRA_EXT(ARB_color_buffer_float);
-EXTRA_EXT(ARB_copy_buffer);
EXTRA_EXT(EXT_framebuffer_sRGB);
EXTRA_EXT(ARB_texture_buffer_object);
EXTRA_EXT(OES_EGL_image_external);
EXTRA_EXT(ARB_blend_func_extended);
EXTRA_EXT(ARB_uniform_buffer_object);
EXTRA_EXT(ARB_timer_query);
+EXTRA_EXT(ARB_map_buffer_alignment);
static const int
extra_NV_primitive_restart[] = {
@@ -360,7 +357,7 @@ extra_ARB_vertex_program_api_es2[] = {
* GLES2 if the NV_read_buffer extension is available. */
static const int
extra_NV_read_buffer_api_gl[] = {
- EXT(NV_read_buffer),
+ EXTRA_API_ES2,
EXTRA_API_GL,
EXTRA_END
};