Merge branch 'arb_sampler_objects'
- docs/GL3.txt 1 addition, 1 deletiondocs/GL3.txt
- docs/relnotes-7.11.html 1 addition, 0 deletionsdocs/relnotes-7.11.html
- src/mapi/glapi/gen/ARB_sampler_objects.xml 96 additions, 0 deletionssrc/mapi/glapi/gen/ARB_sampler_objects.xml
- src/mapi/glapi/gen/Makefile 1 addition, 0 deletionssrc/mapi/glapi/gen/Makefile
- src/mapi/glapi/gen/gl_API.xml 2 additions, 0 deletionssrc/mapi/glapi/gen/gl_API.xml
- src/mapi/glapi/glapi_mapi_tmp.h 929 additions, 775 deletionssrc/mapi/glapi/glapi_mapi_tmp.h
- src/mapi/glapi/glapi_sparc.S 341 additions, 327 deletionssrc/mapi/glapi/glapi_sparc.S
- src/mapi/glapi/glapi_x86-64.S 1869 additions, 1355 deletionssrc/mapi/glapi/glapi_x86-64.S
- src/mapi/glapi/glapi_x86.S 488 additions, 474 deletionssrc/mapi/glapi/glapi_x86.S
- src/mapi/glapi/glapitable.h 308 additions, 294 deletionssrc/mapi/glapi/glapitable.h
- src/mapi/glapi/glapitemp.h 198 additions, 114 deletionssrc/mapi/glapi/glapitemp.h
- src/mapi/glapi/glprocs.h 750 additions, 722 deletionssrc/mapi/glapi/glprocs.h
- src/mesa/SConscript 1 addition, 0 deletionssrc/mesa/SConscript
- src/mesa/drivers/common/meta.c 9 additions, 9 deletionssrc/mesa/drivers/common/meta.c
- src/mesa/drivers/dri/common/texmem.c 4 additions, 3 deletionssrc/mesa/drivers/dri/common/texmem.c
- src/mesa/drivers/dri/i810/i810tex.c 6 additions, 6 deletionssrc/mesa/drivers/dri/i810/i810tex.c
- src/mesa/drivers/dri/i915/i830_texstate.c 12 additions, 12 deletionssrc/mesa/drivers/dri/i915/i830_texstate.c
- src/mesa/drivers/dri/i915/i915_texstate.c 19 additions, 19 deletionssrc/mesa/drivers/dri/i915/i915_texstate.c
- src/mesa/drivers/dri/i965/brw_draw.c 6 additions, 6 deletionssrc/mesa/drivers/dri/i965/brw_draw.c
- src/mesa/drivers/dri/i965/brw_wm.c 4 additions, 4 deletionssrc/mesa/drivers/dri/i965/brw_wm.c