Merge branch 'master' of git.freedesktop.org:/git/mesa/mesa into debian-experimental

Conflicts:

	.gitignore
	Makefile
	bin/mklib
	configs/.gitignore
	configs/default
	configs/freebsd
	configs/freebsd-dri
	configs/linux-osmesa
	configs/linux-osmesa16
	configs/linux-osmesa16-static
	configs/linux-osmesa32
	docs/download.html
	docs/install.html
	docs/news.html
	docs/relnotes.html
	doxygen/Makefile
	doxygen/doxy.bat
	doxygen/header.html
	doxygen/header_subset.html
	include/GL/internal/dri_interface.h
	progs/demos/.gitignore
	progs/directfb/Makefile
	progs/egl/Makefile
	progs/fbdev/Makefile
	progs/fbdev/glfbdevtest.c
	progs/fp/Makefile
	progs/glsl/.gitignore
	progs/glsl/Makefile
	progs/glsl/bump.c
	progs/glsl/mandelbrot.c
	progs/glsl/noise.c
	progs/glsl/toyball.c
	progs/miniglx/Makefile
	progs/samples/.gitignore
	progs/slang/Makefile
	progs/tests/.gitignore
	progs/tests/Makefile
	progs/tests/arbnpot.c
	progs/tests/cva.c
	progs/tests/dinoshade.c
	progs/tests/drawbuffers.c
	progs/tests/fbotest2.c
	progs/tests/fbotexture.c
	progs/tests/getprocaddress.c
	progs/tests/mipmap_limits.c
	progs/tests/multipal.c
	progs/tests/texline.c
	progs/tools/trace/Makefile
	progs/trivial/Makefile
	progs/trivial/dlist-edgeflag-dangling.c
	progs/trivial/dlist-edgeflag.c
	progs/trivial/point-param.c
	progs/trivial/quad-clip-nearplane.c
	progs/trivial/tri.c
	progs/vp/Makefile
	progs/xdemos/.gitignore
	progs/xdemos/Makefile
	progs/xdemos/glthreads.c
	src/egl/Makefile
	src/egl/drivers/demo/Makefile
	src/egl/drivers/dri/Makefile
	src/egl/main/Makefile
	src/glu/mesa/Makefile
	src/glu/mesa/Makefile.m32
	src/glu/mesa/project.c
	src/glu/mini/project.c
	src/glut/directfb/Makefile
	src/glut/directfb/callback.c
	src/glut/directfb/events.c
	src/glut/directfb/internal.h
	src/glut/directfb/window.c
	src/glut/os2/Makefile
	src/glut/os2/WarpWin.cpp
	src/glut/os2/glutOverlay.cpp
	src/glut/os2/glut_8x13.cpp
	src/glut/os2/glut_9x15.cpp
	src/glut/os2/glut_bitmap.cpp
	src/glut/os2/glut_cindex.cpp
	src/glut/os2/glut_cmap.cpp
	src/glut/os2/glut_cursor.cpp
	src/glut/os2/glut_event.cpp
	src/glut/os2/glut_ext.cpp
	src/glut/os2/glut_fullscrn.cpp
	src/glut/os2/glut_gamemode.cpp
	src/glut/os2/glut_get.cpp
	src/glut/os2/glut_hel10.cpp
	src/glut/os2/glut_hel12.cpp
	src/glut/os2/glut_hel18.cpp
	src/glut/os2/glut_init.cpp
	src/glut/os2/glut_input.cpp
	src/glut/os2/glut_key.cpp
	src/glut/os2/glut_keyctrl.cpp
	src/glut/os2/glut_keyup.cpp
	src/glut/os2/glut_mesa.cpp
	src/glut/os2/glut_modifier.cpp
	src/glut/os2/glut_roman.cpp
	src/glut/os2/glut_shapes.cpp
	src/glut/os2/glut_stroke.cpp
	src/glut/os2/glut_swap.cpp
	src/glut/os2/glut_teapot.cpp
	src/glut/os2/glut_tr24.cpp
	src/glut/os2/glut_util.cpp
	src/glut/os2/glut_vidresize.cpp
	src/glut/os2/glut_warp.cpp
	src/glut/os2/glut_win.cpp
	src/glut/os2/glut_winmisc.cpp
	src/glut/os2/glutbitmap.h
	src/glut/os2/glutstroke.h
	src/glut/os2/layerutil.h
	src/glut/os2/libGlut.DEF
	src/glut/os2/os2_glx.cpp
	src/glut/os2/os2_menu.cpp
	src/glut/os2/os2_winproc.cpp
	src/glw/Makefile
	src/glx/mini/Makefile
	src/glx/mini/miniglx.c
	src/glx/x11/glxext.c
	src/mesa/Makefile
	src/mesa/drivers/allegro/amesa.c
	src/mesa/drivers/allegro/direct.h
	src/mesa/drivers/allegro/generic.h
	src/mesa/drivers/d3d/D3DCAPS.CPP
	src/mesa/drivers/d3d/D3DHAL.H
	src/mesa/drivers/d3d/D3DInit.cpp
	src/mesa/drivers/d3d/D3DMESA.H
	src/mesa/drivers/d3d/D3DRaster.cpp
	src/mesa/drivers/d3d/D3DTEXT.CPP
	src/mesa/drivers/d3d/D3DTextureMgr.cpp
	src/mesa/drivers/d3d/D3DTextureMgr.h
	src/mesa/drivers/d3d/D3DUTILS.CPP
	src/mesa/drivers/d3d/DDrawPROCS.c
	src/mesa/drivers/d3d/DEBUG.C
	src/mesa/drivers/d3d/DEBUG.H
	src/mesa/drivers/d3d/DbgEnv.bat
	src/mesa/drivers/d3d/MAKEFILE
	src/mesa/drivers/d3d/OPENGL32.DEF
	src/mesa/drivers/d3d/WGL.C
	src/mesa/drivers/dri/Makefile.template
	src/mesa/drivers/dri/common/dri_bufmgr.c
	src/mesa/drivers/dri/common/dri_drmpool.c
	src/mesa/drivers/dri/common/dri_util.c
	src/mesa/drivers/dri/common/dri_util.h
	src/mesa/drivers/dri/common/xmlconfig.c
	src/mesa/drivers/dri/glcore/Makefile
	src/mesa/drivers/dri/i915/i915_fragprog.c
	src/mesa/drivers/dri/i915/i915_program.h
	src/mesa/drivers/dri/i915/i915_texprog.c
	src/mesa/drivers/dri/i915/i915_texstate.c
	src/mesa/drivers/dri/i915/i915_vtbl.c
	src/mesa/drivers/dri/i915/intel_context.c
	src/mesa/drivers/dri/i915/intel_context.h
	src/mesa/drivers/dri/i915/intel_pixel.c
	src/mesa/drivers/dri/i915/intel_render.c
	src/mesa/drivers/dri/i915/intel_screen.c
	src/mesa/drivers/dri/i915/intel_state.c
	src/mesa/drivers/dri/i915/intel_tex.c
	src/mesa/drivers/dri/i915/intel_tris.c
	src/mesa/drivers/dri/i915tex/i830_reg.h
	src/mesa/drivers/dri/i915tex/i830_texstate.c
	src/mesa/drivers/dri/i915tex/i830_vtbl.c
	src/mesa/drivers/dri/i915tex/i915_fragprog.c
	src/mesa/drivers/dri/i915tex/i915_metaops.c
	src/mesa/drivers/dri/i915tex/i915_tex_layout.c
	src/mesa/drivers/dri/i915tex/i915_texstate.c
	src/mesa/drivers/dri/i915tex/i915_vtbl.c
	src/mesa/drivers/dri/i915tex/intel_render.c
	src/mesa/drivers/dri/i915tex/intel_screen.c
	src/mesa/drivers/dri/i915tex/intel_tris.c
	src/mesa/drivers/dri/i965/brw_aub.c
	src/mesa/drivers/dri/i965/brw_aub_playback.c
	src/mesa/drivers/dri/i965/brw_cc.c
	src/mesa/drivers/dri/i965/brw_clip.c
	src/mesa/drivers/dri/i965/brw_clip_state.c
	src/mesa/drivers/dri/i965/brw_clip_util.c
	src/mesa/drivers/dri/i965/brw_context.c
	src/mesa/drivers/dri/i965/brw_curbe.c
	src/mesa/drivers/dri/i965/brw_defines.h
	src/mesa/drivers/dri/i965/brw_draw.c
	src/mesa/drivers/dri/i965/brw_draw_upload.c
	src/mesa/drivers/dri/i965/brw_eu.h
	src/mesa/drivers/dri/i965/brw_eu_emit.c
	src/mesa/drivers/dri/i965/brw_gs_state.c
	src/mesa/drivers/dri/i965/brw_misc_state.c
	src/mesa/drivers/dri/i965/brw_sf_emit.c
	src/mesa/drivers/dri/i965/brw_sf_state.c
	src/mesa/drivers/dri/i965/brw_state_cache.c
	src/mesa/drivers/dri/i965/brw_state_pool.c
	src/mesa/drivers/dri/i965/brw_tex.c
	src/mesa/drivers/dri/i965/brw_tex_layout.c
	src/mesa/drivers/dri/i965/brw_vs_state.c
	src/mesa/drivers/dri/i965/brw_vs_tnl.c
	src/mesa/drivers/dri/i965/brw_wm.c
	src/mesa/drivers/dri/i965/brw_wm.h
	src/mesa/drivers/dri/i965/brw_wm_glsl.c
	src/mesa/drivers/dri/i965/brw_wm_sampler_state.c
	src/mesa/drivers/dri/i965/brw_wm_state.c
	src/mesa/drivers/dri/i965/brw_wm_surface_state.c
	src/mesa/drivers/dri/i965/bufmgr_fake.c
	src/mesa/drivers/dri/i965/intel_batchbuffer.c
	src/mesa/drivers/dri/i965/intel_batchbuffer.h
	src/mesa/drivers/dri/i965/intel_blit.c
	src/mesa/drivers/dri/i965/intel_blit.h
	src/mesa/drivers/dri/i965/intel_buffers.c
	src/mesa/drivers/dri/i965/intel_context.c
	src/mesa/drivers/dri/i965/intel_context.h
	src/mesa/drivers/dri/i965/intel_mipmap_tree.c
	src/mesa/drivers/dri/i965/intel_mipmap_tree.h
	src/mesa/drivers/dri/i965/intel_pixel_bitmap.c
	src/mesa/drivers/dri/i965/intel_pixel_copy.c
	src/mesa/drivers/dri/i965/intel_screen.c
	src/mesa/drivers/dri/i965/intel_tex_validate.c
	src/mesa/drivers/dri/i965/server/i830_common.h
	src/mesa/drivers/dri/intel/intel_batchbuffer.c
	src/mesa/drivers/dri/intel/intel_batchbuffer.h
	src/mesa/drivers/dri/intel/intel_blit.c
	src/mesa/drivers/dri/intel/intel_buffers.c
	src/mesa/drivers/dri/intel/intel_context.c
	src/mesa/drivers/dri/intel/intel_context.h
	src/mesa/drivers/dri/intel/intel_mipmap_tree.c
	src/mesa/drivers/dri/intel/intel_mipmap_tree.h
	src/mesa/drivers/dri/intel/intel_screen.h
	src/mesa/drivers/dri/r200/r200_texstate.c
	src/mesa/drivers/dri/r300/r300_cmdbuf.c
	src/mesa/drivers/dri/r300/r300_context.h
	src/mesa/drivers/dri/r300/r300_ioctl.c
	src/mesa/drivers/dri/r300/r300_reg.h
	src/mesa/drivers/dri/r300/r300_state.c
	src/mesa/drivers/dri/r300/r300_tex.h
	src/mesa/drivers/dri/r300/r300_texstate.c
	src/mesa/drivers/dri/radeon/radeon_screen.c
	src/mesa/drivers/windows/gdi/wmesa.c
	src/mesa/drivers/x11/fakeglx.c
	src/mesa/drivers/x11/xm_dd.c
	src/mesa/glapi/Makefile
	src/mesa/glapi/dispatch.h
	src/mesa/glapi/glapioffsets.h
	src/mesa/glapi/glapitable.h
	src/mesa/glapi/glapitemp.h
	src/mesa/glapi/glprocs.h
	src/mesa/main/api_validate.c
	src/mesa/main/attrib.c
	src/mesa/main/config.h
	src/mesa/main/context.c
	src/mesa/main/context.h
	src/mesa/main/dlist.c
	src/mesa/main/drawpix.c
	src/mesa/main/enums.c
	src/mesa/main/fbobject.c
	src/mesa/main/image.c
	src/mesa/main/imports.h
	src/mesa/main/mtypes.h
	src/mesa/main/points.c
	src/mesa/main/state.c
	src/mesa/main/texcompress_fxt1.c
	src/mesa/main/texenvprogram.c
	src/mesa/main/teximage.c
	src/mesa/main/texobj.c
	src/mesa/main/texstate.c
	src/mesa/main/version.h
	src/mesa/shader/prog_execute.c
	src/mesa/shader/program.c
	src/mesa/shader/shader_api.c
	src/mesa/shader/slang/library/slang_core.gc
	src/mesa/shader/slang/library/slang_core_gc.h
	src/mesa/shader/slang/slang_codegen.c
	src/mesa/sources
	src/mesa/sparc/glapi_sparc.S
	src/mesa/swrast/s_aalinetemp.h
	src/mesa/swrast/s_aatriangle.c
	src/mesa/swrast/s_aatritemp.h
	src/mesa/swrast/s_context.c
	src/mesa/swrast/s_copypix.c
	src/mesa/swrast/s_drawpix.c
	src/mesa/swrast/s_fragprog.c
	src/mesa/swrast/s_pointtemp.h
	src/mesa/swrast/s_readpix.c
	src/mesa/swrast/s_span.c
	src/mesa/swrast/s_texfilter.c
	src/mesa/swrast/s_tritemp.h
	src/mesa/swrast/s_zoom.c
	src/mesa/tnl/t_draw.c
	src/mesa/tnl/t_vb_fog.c
	src/mesa/tnl/t_vb_program.c
	src/mesa/tnl/t_vp_build.c
	src/mesa/vbo/vbo_split_copy.c
	src/mesa/x86-64/xform4.S
	src/mesa/x86/common_x86.c
	src/mesa/x86/glapi_x86.S
	windows/VC6/mesa/mesa/mesa.dsp

1 files changed, 104 insertions, 125 deletions

diff --git a/src/mesa/glapi/dispatch.h b/src/mesa/glapi/dispatch.h
index d073f4a5ea9..71231560852 100644
--- a/src/mesa/glapi/dispatch.h
+++ b/src/mesa/glapi/dispatch.h
@@ -2077,18 +2077,6 @@
 #define CALL_LoadProgramNV(disp, parameters) (*((disp)->LoadProgramNV)) parameters
 #define GET_LoadProgramNV(disp) ((disp)->LoadProgramNV)
 #define SET_LoadProgramNV(disp, fn) ((disp)->LoadProgramNV = fn)
-#define CALL_ProgramParameter4dNV(disp, parameters) (*((disp)->ProgramParameter4dNV)) parameters
-#define GET_ProgramParameter4dNV(disp) ((disp)->ProgramParameter4dNV)
-#define SET_ProgramParameter4dNV(disp, fn) ((disp)->ProgramParameter4dNV = fn)
-#define CALL_ProgramParameter4dvNV(disp, parameters) (*((disp)->ProgramParameter4dvNV)) parameters
-#define GET_ProgramParameter4dvNV(disp) ((disp)->ProgramParameter4dvNV)
-#define SET_ProgramParameter4dvNV(disp, fn) ((disp)->ProgramParameter4dvNV = fn)
-#define CALL_ProgramParameter4fNV(disp, parameters) (*((disp)->ProgramParameter4fNV)) parameters
-#define GET_ProgramParameter4fNV(disp) ((disp)->ProgramParameter4fNV)
-#define SET_ProgramParameter4fNV(disp, fn) ((disp)->ProgramParameter4fNV = fn)
-#define CALL_ProgramParameter4fvNV(disp, parameters) (*((disp)->ProgramParameter4fvNV)) parameters
-#define GET_ProgramParameter4fvNV(disp) ((disp)->ProgramParameter4fvNV)
-#define SET_ProgramParameter4fvNV(disp, fn) ((disp)->ProgramParameter4fvNV = fn)
 #define CALL_ProgramParameters4dvNV(disp, parameters) (*((disp)->ProgramParameters4dvNV)) parameters
 #define GET_ProgramParameters4dvNV(disp) ((disp)->ProgramParameters4dvNV)
 #define SET_ProgramParameters4dvNV(disp, fn) ((disp)->ProgramParameters4dvNV = fn)
@@ -2362,6 +2350,9 @@
 #define CALL_BlitFramebufferEXT(disp, parameters) (*((disp)->BlitFramebufferEXT)) parameters
 #define GET_BlitFramebufferEXT(disp) ((disp)->BlitFramebufferEXT)
 #define SET_BlitFramebufferEXT(disp, fn) ((disp)->BlitFramebufferEXT = fn)
+#define CALL_FramebufferTextureLayerEXT(disp, parameters) (*((disp)->FramebufferTextureLayerEXT)) parameters
+#define GET_FramebufferTextureLayerEXT(disp) ((disp)->FramebufferTextureLayerEXT)
+#define SET_FramebufferTextureLayerEXT(disp, fn) ((disp)->FramebufferTextureLayerEXT = fn)
 #define CALL_StencilFuncSeparateATI(disp, parameters) (*((disp)->StencilFuncSeparateATI)) parameters
 #define GET_StencilFuncSeparateATI(disp) ((disp)->StencilFuncSeparateATI)
 #define SET_StencilFuncSeparateATI(disp, fn) ((disp)->StencilFuncSeparateATI = fn)
@@ -2380,7 +2371,7 @@
 
 #else
 
-#define driDispatchRemapTable_size 365
+#define driDispatchRemapTable_size 362
 extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 
 #define AttachShader_remap_index 0
@@ -2648,106 +2639,103 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define GetVertexAttribivNV_remap_index 262
 #define IsProgramNV_remap_index 263
 #define LoadProgramNV_remap_index 264
-#define ProgramParameter4dNV_remap_index 265
-#define ProgramParameter4dvNV_remap_index 266
-#define ProgramParameter4fNV_remap_index 267
-#define ProgramParameter4fvNV_remap_index 268
-#define ProgramParameters4dvNV_remap_index 269
-#define ProgramParameters4fvNV_remap_index 270
-#define RequestResidentProgramsNV_remap_index 271
-#define TrackMatrixNV_remap_index 272
-#define VertexAttrib1dNV_remap_index 273
-#define VertexAttrib1dvNV_remap_index 274
-#define VertexAttrib1fNV_remap_index 275
-#define VertexAttrib1fvNV_remap_index 276
-#define VertexAttrib1sNV_remap_index 277
-#define VertexAttrib1svNV_remap_index 278
-#define VertexAttrib2dNV_remap_index 279
-#define VertexAttrib2dvNV_remap_index 280
-#define VertexAttrib2fNV_remap_index 281
-#define VertexAttrib2fvNV_remap_index 282
-#define VertexAttrib2sNV_remap_index 283
-#define VertexAttrib2svNV_remap_index 284
-#define VertexAttrib3dNV_remap_index 285
-#define VertexAttrib3dvNV_remap_index 286
-#define VertexAttrib3fNV_remap_index 287
-#define VertexAttrib3fvNV_remap_index 288
-#define VertexAttrib3sNV_remap_index 289
-#define VertexAttrib3svNV_remap_index 290
-#define VertexAttrib4dNV_remap_index 291
-#define VertexAttrib4dvNV_remap_index 292
-#define VertexAttrib4fNV_remap_index 293
-#define VertexAttrib4fvNV_remap_index 294
-#define VertexAttrib4sNV_remap_index 295
-#define VertexAttrib4svNV_remap_index 296
-#define VertexAttrib4ubNV_remap_index 297
-#define VertexAttrib4ubvNV_remap_index 298
-#define VertexAttribPointerNV_remap_index 299
-#define VertexAttribs1dvNV_remap_index 300
-#define VertexAttribs1fvNV_remap_index 301
-#define VertexAttribs1svNV_remap_index 302
-#define VertexAttribs2dvNV_remap_index 303
-#define VertexAttribs2fvNV_remap_index 304
-#define VertexAttribs2svNV_remap_index 305
-#define VertexAttribs3dvNV_remap_index 306
-#define VertexAttribs3fvNV_remap_index 307
-#define VertexAttribs3svNV_remap_index 308
-#define VertexAttribs4dvNV_remap_index 309
-#define VertexAttribs4fvNV_remap_index 310
-#define VertexAttribs4svNV_remap_index 311
-#define VertexAttribs4ubvNV_remap_index 312
-#define AlphaFragmentOp1ATI_remap_index 313
-#define AlphaFragmentOp2ATI_remap_index 314
-#define AlphaFragmentOp3ATI_remap_index 315
-#define BeginFragmentShaderATI_remap_index 316
-#define BindFragmentShaderATI_remap_index 317
-#define ColorFragmentOp1ATI_remap_index 318
-#define ColorFragmentOp2ATI_remap_index 319
-#define ColorFragmentOp3ATI_remap_index 320
-#define DeleteFragmentShaderATI_remap_index 321
-#define EndFragmentShaderATI_remap_index 322
-#define GenFragmentShadersATI_remap_index 323
-#define PassTexCoordATI_remap_index 324
-#define SampleMapATI_remap_index 325
-#define SetFragmentShaderConstantATI_remap_index 326
-#define PointParameteriNV_remap_index 327
-#define PointParameterivNV_remap_index 328
-#define ActiveStencilFaceEXT_remap_index 329
-#define BindVertexArrayAPPLE_remap_index 330
-#define DeleteVertexArraysAPPLE_remap_index 331
-#define GenVertexArraysAPPLE_remap_index 332
-#define IsVertexArrayAPPLE_remap_index 333
-#define GetProgramNamedParameterdvNV_remap_index 334
-#define GetProgramNamedParameterfvNV_remap_index 335
-#define ProgramNamedParameter4dNV_remap_index 336
-#define ProgramNamedParameter4dvNV_remap_index 337
-#define ProgramNamedParameter4fNV_remap_index 338
-#define ProgramNamedParameter4fvNV_remap_index 339
-#define DepthBoundsEXT_remap_index 340
-#define BlendEquationSeparateEXT_remap_index 341
-#define BindFramebufferEXT_remap_index 342
-#define BindRenderbufferEXT_remap_index 343
-#define CheckFramebufferStatusEXT_remap_index 344
-#define DeleteFramebuffersEXT_remap_index 345
-#define DeleteRenderbuffersEXT_remap_index 346
-#define FramebufferRenderbufferEXT_remap_index 347
-#define FramebufferTexture1DEXT_remap_index 348
-#define FramebufferTexture2DEXT_remap_index 349
-#define FramebufferTexture3DEXT_remap_index 350
-#define GenFramebuffersEXT_remap_index 351
-#define GenRenderbuffersEXT_remap_index 352
-#define GenerateMipmapEXT_remap_index 353
-#define GetFramebufferAttachmentParameterivEXT_remap_index 354
-#define GetRenderbufferParameterivEXT_remap_index 355
-#define IsFramebufferEXT_remap_index 356
-#define IsRenderbufferEXT_remap_index 357
-#define RenderbufferStorageEXT_remap_index 358
-#define BlitFramebufferEXT_remap_index 359
-#define StencilFuncSeparateATI_remap_index 360
-#define ProgramEnvParameters4fvEXT_remap_index 361
-#define ProgramLocalParameters4fvEXT_remap_index 362
-#define GetQueryObjecti64vEXT_remap_index 363
-#define GetQueryObjectui64vEXT_remap_index 364
+#define ProgramParameters4dvNV_remap_index 265
+#define ProgramParameters4fvNV_remap_index 266
+#define RequestResidentProgramsNV_remap_index 267
+#define TrackMatrixNV_remap_index 268
+#define VertexAttrib1dNV_remap_index 269
+#define VertexAttrib1dvNV_remap_index 270
+#define VertexAttrib1fNV_remap_index 271
+#define VertexAttrib1fvNV_remap_index 272
+#define VertexAttrib1sNV_remap_index 273
+#define VertexAttrib1svNV_remap_index 274
+#define VertexAttrib2dNV_remap_index 275
+#define VertexAttrib2dvNV_remap_index 276
+#define VertexAttrib2fNV_remap_index 277
+#define VertexAttrib2fvNV_remap_index 278
+#define VertexAttrib2sNV_remap_index 279
+#define VertexAttrib2svNV_remap_index 280
+#define VertexAttrib3dNV_remap_index 281
+#define VertexAttrib3dvNV_remap_index 282
+#define VertexAttrib3fNV_remap_index 283
+#define VertexAttrib3fvNV_remap_index 284
+#define VertexAttrib3sNV_remap_index 285
+#define VertexAttrib3svNV_remap_index 286
+#define VertexAttrib4dNV_remap_index 287
+#define VertexAttrib4dvNV_remap_index 288
+#define VertexAttrib4fNV_remap_index 289
+#define VertexAttrib4fvNV_remap_index 290
+#define VertexAttrib4sNV_remap_index 291
+#define VertexAttrib4svNV_remap_index 292
+#define VertexAttrib4ubNV_remap_index 293
+#define VertexAttrib4ubvNV_remap_index 294
+#define VertexAttribPointerNV_remap_index 295
+#define VertexAttribs1dvNV_remap_index 296
+#define VertexAttribs1fvNV_remap_index 297
+#define VertexAttribs1svNV_remap_index 298
+#define VertexAttribs2dvNV_remap_index 299
+#define VertexAttribs2fvNV_remap_index 300
+#define VertexAttribs2svNV_remap_index 301
+#define VertexAttribs3dvNV_remap_index 302
+#define VertexAttribs3fvNV_remap_index 303
+#define VertexAttribs3svNV_remap_index 304
+#define VertexAttribs4dvNV_remap_index 305
+#define VertexAttribs4fvNV_remap_index 306
+#define VertexAttribs4svNV_remap_index 307
+#define VertexAttribs4ubvNV_remap_index 308
+#define AlphaFragmentOp1ATI_remap_index 309
+#define AlphaFragmentOp2ATI_remap_index 310
+#define AlphaFragmentOp3ATI_remap_index 311
+#define BeginFragmentShaderATI_remap_index 312
+#define BindFragmentShaderATI_remap_index 313
+#define ColorFragmentOp1ATI_remap_index 314
+#define ColorFragmentOp2ATI_remap_index 315
+#define ColorFragmentOp3ATI_remap_index 316
+#define DeleteFragmentShaderATI_remap_index 317
+#define EndFragmentShaderATI_remap_index 318
+#define GenFragmentShadersATI_remap_index 319
+#define PassTexCoordATI_remap_index 320
+#define SampleMapATI_remap_index 321
+#define SetFragmentShaderConstantATI_remap_index 322
+#define PointParameteriNV_remap_index 323
+#define PointParameterivNV_remap_index 324
+#define ActiveStencilFaceEXT_remap_index 325
+#define BindVertexArrayAPPLE_remap_index 326
+#define DeleteVertexArraysAPPLE_remap_index 327
+#define GenVertexArraysAPPLE_remap_index 328
+#define IsVertexArrayAPPLE_remap_index 329
+#define GetProgramNamedParameterdvNV_remap_index 330
+#define GetProgramNamedParameterfvNV_remap_index 331
+#define ProgramNamedParameter4dNV_remap_index 332
+#define ProgramNamedParameter4dvNV_remap_index 333
+#define ProgramNamedParameter4fNV_remap_index 334
+#define ProgramNamedParameter4fvNV_remap_index 335
+#define DepthBoundsEXT_remap_index 336
+#define BlendEquationSeparateEXT_remap_index 337
+#define BindFramebufferEXT_remap_index 338
+#define BindRenderbufferEXT_remap_index 339
+#define CheckFramebufferStatusEXT_remap_index 340
+#define DeleteFramebuffersEXT_remap_index 341
+#define DeleteRenderbuffersEXT_remap_index 342
+#define FramebufferRenderbufferEXT_remap_index 343
+#define FramebufferTexture1DEXT_remap_index 344
+#define FramebufferTexture2DEXT_remap_index 345
+#define FramebufferTexture3DEXT_remap_index 346
+#define GenFramebuffersEXT_remap_index 347
+#define GenRenderbuffersEXT_remap_index 348
+#define GenerateMipmapEXT_remap_index 349
+#define GetFramebufferAttachmentParameterivEXT_remap_index 350
+#define GetRenderbufferParameterivEXT_remap_index 351
+#define IsFramebufferEXT_remap_index 352
+#define IsRenderbufferEXT_remap_index 353
+#define RenderbufferStorageEXT_remap_index 354
+#define BlitFramebufferEXT_remap_index 355
+#define FramebufferTextureLayerEXT_remap_index 356
+#define StencilFuncSeparateATI_remap_index 357
+#define ProgramEnvParameters4fvEXT_remap_index 358
+#define ProgramLocalParameters4fvEXT_remap_index 359
+#define GetQueryObjecti64vEXT_remap_index 360
+#define GetQueryObjectui64vEXT_remap_index 361
 
 #define CALL_AttachShader(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLuint)), driDispatchRemapTable[AttachShader_remap_index], parameters)
 #define GET_AttachShader(disp) GET_by_offset(disp, driDispatchRemapTable[AttachShader_remap_index])
@@ -3544,18 +3532,6 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define CALL_LoadProgramNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLsizei, const GLubyte *)), driDispatchRemapTable[LoadProgramNV_remap_index], parameters)
 #define GET_LoadProgramNV(disp) GET_by_offset(disp, driDispatchRemapTable[LoadProgramNV_remap_index])
 #define SET_LoadProgramNV(disp, fn) SET_by_offset(disp, driDispatchRemapTable[LoadProgramNV_remap_index], fn)
-#define CALL_ProgramParameter4dNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble)), driDispatchRemapTable[ProgramParameter4dNV_remap_index], parameters)
-#define GET_ProgramParameter4dNV(disp) GET_by_offset(disp, driDispatchRemapTable[ProgramParameter4dNV_remap_index])
-#define SET_ProgramParameter4dNV(disp, fn) SET_by_offset(disp, driDispatchRemapTable[ProgramParameter4dNV_remap_index], fn)
-#define CALL_ProgramParameter4dvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, const GLdouble *)), driDispatchRemapTable[ProgramParameter4dvNV_remap_index], parameters)
-#define GET_ProgramParameter4dvNV(disp) GET_by_offset(disp, driDispatchRemapTable[ProgramParameter4dvNV_remap_index])
-#define SET_ProgramParameter4dvNV(disp, fn) SET_by_offset(disp, driDispatchRemapTable[ProgramParameter4dvNV_remap_index], fn)
-#define CALL_ProgramParameter4fNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat)), driDispatchRemapTable[ProgramParameter4fNV_remap_index], parameters)
-#define GET_ProgramParameter4fNV(disp) GET_by_offset(disp, driDispatchRemapTable[ProgramParameter4fNV_remap_index])
-#define SET_ProgramParameter4fNV(disp, fn) SET_by_offset(disp, driDispatchRemapTable[ProgramParameter4fNV_remap_index], fn)
-#define CALL_ProgramParameter4fvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, const GLfloat *)), driDispatchRemapTable[ProgramParameter4fvNV_remap_index], parameters)
-#define GET_ProgramParameter4fvNV(disp) GET_by_offset(disp, driDispatchRemapTable[ProgramParameter4fvNV_remap_index])
-#define SET_ProgramParameter4fvNV(disp, fn) SET_by_offset(disp, driDispatchRemapTable[ProgramParameter4fvNV_remap_index], fn)
 #define CALL_ProgramParameters4dvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLuint, const GLdouble *)), driDispatchRemapTable[ProgramParameters4dvNV_remap_index], parameters)
 #define GET_ProgramParameters4dvNV(disp) GET_by_offset(disp, driDispatchRemapTable[ProgramParameters4dvNV_remap_index])
 #define SET_ProgramParameters4dvNV(disp, fn) SET_by_offset(disp, driDispatchRemapTable[ProgramParameters4dvNV_remap_index], fn)
@@ -3829,6 +3805,9 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define CALL_BlitFramebufferEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum)), driDispatchRemapTable[BlitFramebufferEXT_remap_index], parameters)
 #define GET_BlitFramebufferEXT(disp) GET_by_offset(disp, driDispatchRemapTable[BlitFramebufferEXT_remap_index])
 #define SET_BlitFramebufferEXT(disp, fn) SET_by_offset(disp, driDispatchRemapTable[BlitFramebufferEXT_remap_index], fn)
+#define CALL_FramebufferTextureLayerEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLuint, GLint, GLint)), driDispatchRemapTable[FramebufferTextureLayerEXT_remap_index], parameters)
+#define GET_FramebufferTextureLayerEXT(disp) GET_by_offset(disp, driDispatchRemapTable[FramebufferTextureLayerEXT_remap_index])
+#define SET_FramebufferTextureLayerEXT(disp, fn) SET_by_offset(disp, driDispatchRemapTable[FramebufferTextureLayerEXT_remap_index], fn)
 #define CALL_StencilFuncSeparateATI(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLint, GLuint)), driDispatchRemapTable[StencilFuncSeparateATI_remap_index], parameters)
 #define GET_StencilFuncSeparateATI(disp) GET_by_offset(disp, driDispatchRemapTable[StencilFuncSeparateATI_remap_index])
 #define SET_StencilFuncSeparateATI(disp, fn) SET_by_offset(disp, driDispatchRemapTable[StencilFuncSeparateATI_remap_index], fn)