mesa: Changes to 'upstream-unstable'
Makefile | 22
bin/minstall | 88
bin/mklib | 15
configs/aix | 1
configs/default | 5
configs/freebsd | 3
configs/freebsd-dri | 10
configs/linux-dri | 5
configs/linux-dri-x86-64 | 2
configs/linux-dri-xcb | 5
configs/linux-fbdev | 10
configs/linux-indirect | 1
configs/linux-static | 5
descrip.mms | 2
docs/README.directfb | 2
docs/contents.html | 2
docs/devinfo.html | 14
docs/dispatch.html | 274
docs/mangling.html | 12
docs/news.html | 89
docs/relnotes-6.4.1.html | 68
docs/relnotes-6.4.2.html | 75
docs/relnotes-6.4.html | 90
docs/relnotes-6.5.1.html | 76
docs/relnotes-6.5.2.html | 118
docs/relnotes-6.5.html | 131
docs/relnotes.html | 24
docs/sourcedocs.html | 17
docs/versions.html | 175
include/GL/gl.h | 35
include/GL/gl_mangle.h | 18
include/GL/glx_mangle.h | 58
include/GL/internal/glcore.h | 3
progs/demos/Makefile | 2
progs/demos/cubemap.c | 1
progs/demos/fslight.c | 334
progs/demos/readpix.c | 31
progs/demos/streaming_rect.c | 322
progs/demos/texdown.c | 133
progs/directfb/df_gears.c | 2
progs/directfb/df_morph3d.c | 2
progs/directfb/df_reflect.c | 2
progs/osdemos/osdemo.c | 45
progs/slang/cltest.txt | 40
progs/slang/vstest.txt | 2
progs/tests/cva.c | 8
progs/tests/getprocaddress.c | 88
progs/trivial/Makefile | 2
progs/trivial/quad-tex-pbo.c | 181
progs/xdemos/wincopy.c | 35
src/glu/Makefile | 2
src/glu/sgi/libutil/mipmap.c | 44
src/glut/directfb/ext.c | 7
src/glut/directfb/internal.h | 3
src/glut/fbdev/Makefile | 2
src/glut/fbdev/callback.c | 5
src/glut/fbdev/colormap.c | 9
src/glut/fbdev/cursor.c | 22
src/glut/fbdev/ext.c | 2
src/glut/fbdev/fbdev.c | 122
src/glut/fbdev/gamemode.c | 2
src/glut/fbdev/input.c | 409
src/glut/fbdev/internal.h | 12
src/glut/fbdev/menu.c | 4
src/glut/fbdev/overlay.c | 1
src/glut/fbdev/state.c | 1
src/glut/glx/Makefile | 2
src/glut/glx/glut_cmap.c | 24
src/glut/glx/glut_win.c | 17
src/glut/mini/models.c | 16
src/glw/Makefile | 2
src/glx/mini/miniglx.c | 16
src/glx/x11/XF86dri.c | 4
src/glx/x11/glxext.c | 262
src/glx/x11/indirect.c | 8234 ++++++++------
src/glx/x11/indirect.h | 23
src/glx/x11/indirect_init.c | 406
src/glx/x11/indirect_size.c | 446
src/glx/x11/indirect_vertex_array.c | 6
src/glx/x11/singlepix.c | 87
src/mesa/Makefile | 19
src/mesa/array_cache/sources | 7
src/mesa/drivers/allegro/amesa.c | 12
src/mesa/drivers/common/driverfuncs.c | 3
src/mesa/drivers/common/sources | 2
src/mesa/drivers/directfb/idirectfbgl_mesa.c | 185
src/mesa/drivers/dri/Makefile.template | 9
src/mesa/drivers/dri/common/dri_bufmgr.c | 493
src/mesa/drivers/dri/common/dri_bufmgr.h | 99
src/mesa/drivers/dri/common/dri_bufpool.h | 86
src/mesa/drivers/dri/common/dri_drmpool.c | 227
src/mesa/drivers/dri/common/dri_util.c | 21
src/mesa/drivers/dri/common/dri_util.h | 15
src/mesa/drivers/dri/common/drirenderbuffer.h | 7
src/mesa/drivers/dri/common/extension_helper.h | 894 +
src/mesa/drivers/dri/common/utils.c | 13
src/mesa/drivers/dri/common/utils.h | 2
src/mesa/drivers/dri/common/vblank.c | 129
src/mesa/drivers/dri/common/vblank.h | 9
src/mesa/drivers/dri/common/xmlpool/options.h | 5
src/mesa/drivers/dri/common/xmlpool/t_options.h | 5
src/mesa/drivers/dri/fb/fb_dri.c | 1
src/mesa/drivers/dri/fb/fb_egl.c | 1
src/mesa/drivers/dri/ffb/ffb_clear.c | 44
src/mesa/drivers/dri/ffb/ffb_clear.h | 5
src/mesa/drivers/dri/ffb/ffb_xmesa.c | 3
src/mesa/drivers/dri/gamma/gamma_dd.c | 23
src/mesa/drivers/dri/gamma/gamma_state.c | 5
src/mesa/drivers/dri/i810/i810context.c | 1
src/mesa/drivers/dri/i810/i810ioctl.c | 17
src/mesa/drivers/dri/i810/i810state.c | 15
src/mesa/drivers/dri/i915/i830_metaops.c | 16
src/mesa/drivers/dri/i915/i830_state.c | 2
src/mesa/drivers/dri/i915/i915_context.c | 3
src/mesa/drivers/dri/i915/i915_fragprog.c | 27
src/mesa/drivers/dri/i915/i915_metaops.c | 22
src/mesa/drivers/dri/i915/i915_program.c | 5
src/mesa/drivers/dri/i915/i915_state.c | 2
src/mesa/drivers/dri/i915/i915_texprog.c | 5
src/mesa/drivers/dri/i915/i915_vtbl.c | 4
src/mesa/drivers/dri/i915/intel_batchbuffer.c | 235
src/mesa/drivers/dri/i915/intel_context.c | 78
src/mesa/drivers/dri/i915/intel_context.h | 14
src/mesa/drivers/dri/i915/intel_ioctl.c | 9
src/mesa/drivers/dri/i915/intel_ioctl.h | 3
src/mesa/drivers/dri/i915/intel_pixel.c | 9
src/mesa/drivers/dri/i915/intel_tris.c | 221
src/mesa/drivers/dri/i915/server/i830_common.h | 15
src/mesa/drivers/dri/i915tex/Makefile | 66
src/mesa/drivers/dri/i915tex/i830_context.c | 104
src/mesa/drivers/dri/i915tex/i830_context.h | 213
src/mesa/drivers/dri/i915tex/i830_metaops.c | 457
src/mesa/drivers/dri/i915tex/i830_reg.h | 641 +
src/mesa/drivers/dri/i915tex/i830_state.c | 1114 +
src/mesa/drivers/dri/i915tex/i830_tex.c | 100
src/mesa/drivers/dri/i915tex/i830_texblend.c | 463
src/mesa/drivers/dri/i915tex/i830_texstate.c | 322
src/mesa/drivers/dri/i915tex/i830_vtbl.c | 659 +
src/mesa/drivers/dri/i915tex/i915_context.c | 175
src/mesa/drivers/dri/i915tex/i915_context.h | 367
src/mesa/drivers/dri/i915tex/i915_debug.c | 334
src/mesa/drivers/dri/i915tex/i915_fragprog.c | 1083 +
src/mesa/drivers/dri/i915tex/i915_metaops.c | 509
src/mesa/drivers/dri/i915tex/i915_program.c | 515
src/mesa/drivers/dri/i915tex/i915_program.h | 160
src/mesa/drivers/dri/i915tex/i915_reg.h | 841 +
src/mesa/drivers/dri/i915tex/i915_state.c | 1019 +
src/mesa/drivers/dri/i915tex/i915_tex.c | 113
src/mesa/drivers/dri/i915tex/i915_tex_layout.c | 380
src/mesa/drivers/dri/i915tex/i915_texstate.c | 338
src/mesa/drivers/dri/i915tex/i915_vtbl.c | 550
src/mesa/drivers/dri/i915tex/intel_batchbuffer.c | 342
src/mesa/drivers/dri/i915tex/intel_batchbuffer.h | 124
src/mesa/drivers/dri/i915tex/intel_batchpool.c | 418
src/mesa/drivers/dri/i915tex/intel_blit.c | 579
src/mesa/drivers/dri/i915tex/intel_blit.h | 62
src/mesa/drivers/dri/i915tex/intel_buffer_objects.c | 250
src/mesa/drivers/dri/i915tex/intel_buffer_objects.h | 86
src/mesa/drivers/dri/i915tex/intel_buffers.c | 928 +
src/mesa/drivers/dri/i915tex/intel_buffers.h | 56
src/mesa/drivers/dri/i915tex/intel_context.c | 714 +
src/mesa/drivers/dri/i915tex/intel_context.h | 502
src/mesa/drivers/dri/i915tex/intel_depthstencil.c | 282
src/mesa/drivers/dri/i915tex/intel_depthstencil.h | 14
src/mesa/drivers/dri/i915tex/intel_fbo.c | 622 +
src/mesa/drivers/dri/i915tex/intel_fbo.h | 80
src/mesa/drivers/dri/i915tex/intel_ioctl.c | 138
src/mesa/drivers/dri/i915tex/intel_ioctl.h | 40
src/mesa/drivers/dri/i915tex/intel_mipmap_tree.c | 347
src/mesa/drivers/dri/i915tex/intel_mipmap_tree.h | 198
src/mesa/drivers/dri/i915tex/intel_pixel.c | 120
src/mesa/drivers/dri/i915tex/intel_pixel.h | 63
src/mesa/drivers/dri/i915tex/intel_pixel_bitmap.c | 350
src/mesa/drivers/dri/i915tex/intel_pixel_copy.c | 383
src/mesa/drivers/dri/i915tex/intel_pixel_draw.c | 367
src/mesa/drivers/dri/i915tex/intel_pixel_read.c | 319
src/mesa/drivers/dri/i915tex/intel_reg.h | 84
src/mesa/drivers/dri/i915tex/intel_regions.c | 471
src/mesa/drivers/dri/i915tex/intel_regions.h | 141
src/mesa/drivers/dri/i915tex/intel_render.c | 242
src/mesa/drivers/dri/i915tex/intel_rotate.c | 237
src/mesa/drivers/dri/i915tex/intel_rotate.h | 39
src/mesa/drivers/dri/i915tex/intel_screen.c | 864 +
src/mesa/drivers/dri/i915tex/intel_screen.h | 132
src/mesa/drivers/dri/i915tex/intel_span.c | 409
src/mesa/drivers/dri/i915tex/intel_span.h | 38
src/mesa/drivers/dri/i915tex/intel_state.c | 363
src/mesa/drivers/dri/i915tex/intel_structs.h | 132
src/mesa/drivers/dri/i915tex/intel_tex.c | 192
src/mesa/drivers/dri/i915tex/intel_tex.h | 148
src/mesa/drivers/dri/i915tex/intel_tex_copy.c | 302
src/mesa/drivers/dri/i915tex/intel_tex_format.c | 172
src/mesa/drivers/dri/i915tex/intel_tex_image.c | 686 +
src/mesa/drivers/dri/i915tex/intel_tex_subimage.c | 183
src/mesa/drivers/dri/i915tex/intel_tex_validate.c | 256
src/mesa/drivers/dri/i915tex/intel_tris.c | 1149 +
src/mesa/drivers/dri/i915tex/intel_tris.h | 69
src/mesa/drivers/dri/i915tex/server/i830_common.h | 220
src/mesa/drivers/dri/i915tex/server/i830_dri.h | 63
src/mesa/drivers/dri/i915tex/server/intel.h | 331
src/mesa/drivers/dri/i915tex/server/intel_dri.c | 1333 ++
src/mesa/drivers/dri/i965/Makefile | 2
src/mesa/drivers/dri/i965/brw_attrib.h | 1
src/mesa/drivers/dri/i965/brw_aub_playback.c | 6
src/mesa/drivers/dri/i965/brw_context.c | 2
src/mesa/drivers/dri/i965/brw_context.h | 6
src/mesa/drivers/dri/i965/brw_draw.c | 56
src/mesa/drivers/dri/i965/brw_draw_upload.c | 7
src/mesa/drivers/dri/i965/brw_exec_api.c | 2
src/mesa/drivers/dri/i965/brw_fallback.c | 3
src/mesa/drivers/dri/i965/brw_metaops.c | 100
src/mesa/drivers/dri/i965/brw_misc_state.c | 15
src/mesa/drivers/dri/i965/brw_save_api.c | 16
src/mesa/drivers/dri/i965/brw_save_draw.c | 26
src/mesa/drivers/dri/i965/brw_tex.c | 81
src/mesa/drivers/dri/i965/brw_tex_layout.c | 7
src/mesa/drivers/dri/i965/brw_util.c | 2
src/mesa/drivers/dri/i965/brw_vs.c | 7
src/mesa/drivers/dri/i965/brw_vs.h | 3
src/mesa/drivers/dri/i965/brw_vs_emit.c | 42
src/mesa/drivers/dri/i965/brw_vs_tnl.c | 12
src/mesa/drivers/dri/i965/brw_vtbl.c | 1
src/mesa/drivers/dri/i965/brw_wm.h | 1
src/mesa/drivers/dri/i965/brw_wm_debug.c | 62
src/mesa/drivers/dri/i965/brw_wm_fp.c | 63
src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 18
src/mesa/drivers/dri/i965/bufmgr.h | 2
src/mesa/drivers/dri/i965/bufmgr_fake.c | 16
src/mesa/drivers/dri/i965/intel_batchbuffer.c | 20
src/mesa/drivers/dri/i965/intel_batchbuffer.h | 2
src/mesa/drivers/dri/i965/intel_blit.c | 170
src/mesa/drivers/dri/i965/intel_blit.h | 17
src/mesa/drivers/dri/i965/intel_buffers.c | 46
src/mesa/drivers/dri/i965/intel_context.c | 55
src/mesa/drivers/dri/i965/intel_context.h | 52
src/mesa/drivers/dri/i965/intel_ioctl.c | 33
src/mesa/drivers/dri/i965/intel_ioctl.h | 6
src/mesa/drivers/dri/i965/intel_pixel_bitmap.c | 350
src/mesa/drivers/dri/i965/intel_pixel_copy.c | 343
src/mesa/drivers/dri/i965/intel_regions.c | 3
src/mesa/drivers/dri/i965/intel_screen.c | 4
src/mesa/drivers/dri/i965/intel_span.c | 11
src/mesa/drivers/dri/i965/intel_state.c | 35
src/mesa/drivers/dri/i965/intel_structs.h | 132
src/mesa/drivers/dri/i965/intel_tex_validate.c | 12
src/mesa/drivers/dri/mach64/mach64_context.c | 3
src/mesa/drivers/dri/mach64/mach64_dd.c | 1
src/mesa/drivers/dri/mach64/mach64_ioctl.c | 50
src/mesa/drivers/dri/mach64/mach64_ioctl.h | 2
src/mesa/drivers/dri/mach64/mach64_screen.c | 2
src/mesa/drivers/dri/mach64/mach64_state.c | 15
src/mesa/drivers/dri/mach64/mach64_texmem.c | 16
src/mesa/drivers/dri/mga/mga_xmesa.c | 4
src/mesa/drivers/dri/mga/mgacontext.h | 7
src/mesa/drivers/dri/mga/mgadd.c | 20
src/mesa/drivers/dri/mga/mgaioctl.c | 16
src/mesa/drivers/dri/mga/mgapixel.c | 9
src/mesa/drivers/dri/mga/mgaspan.c | 4
src/mesa/drivers/dri/mga/mgastate.c | 71
src/mesa/drivers/dri/mga/mgatex.c | 3
src/mesa/drivers/dri/r128/r128_context.c | 3
src/mesa/drivers/dri/r128/r128_dd.c | 1
src/mesa/drivers/dri/r128/r128_ioctl.c | 20
src/mesa/drivers/dri/r128/r128_span.c | 8
src/mesa/drivers/dri/r128/r128_state.c | 15
src/mesa/drivers/dri/r200/r200_cmdbuf.c | 2
src/mesa/drivers/dri/r200/r200_context.c | 44
src/mesa/drivers/dri/r200/r200_context.h | 41
src/mesa/drivers/dri/r200/r200_fragshader.c | 43
src/mesa/drivers/dri/r200/r200_ioctl.c | 23
src/mesa/drivers/dri/r200/r200_lock.c | 14
src/mesa/drivers/dri/r200/r200_maos_arrays.c | 195
src/mesa/drivers/dri/r200/r200_pixel.c | 8
src/mesa/drivers/dri/r200/r200_reg.h | 24
src/mesa/drivers/dri/r200/r200_sanity.c | 2
src/mesa/drivers/dri/r200/r200_state.c | 149
src/mesa/drivers/dri/r200/r200_state_init.c | 40
src/mesa/drivers/dri/r200/r200_swtcl.c | 20
src/mesa/drivers/dri/r200/r200_tcl.c | 53
src/mesa/drivers/dri/r200/r200_tex.c | 47
src/mesa/drivers/dri/r200/r200_texmem.c | 4
src/mesa/drivers/dri/r200/r200_texstate.c | 147
src/mesa/drivers/dri/r200/r200_vertprog.c | 384
src/mesa/drivers/dri/r200/r200_vertprog.h | 2
src/mesa/drivers/dri/r300/r300_context.h | 26
src/mesa/drivers/dri/r300/r300_fragprog.c | 276
src/mesa/drivers/dri/r300/r300_fragprog.h | 3
src/mesa/drivers/dri/r300/r300_ioctl.c | 22
src/mesa/drivers/dri/r300/r300_ioctl.h | 1
src/mesa/drivers/dri/r300/r300_maos.c | 4
src/mesa/drivers/dri/r300/r300_reg.h | 2
src/mesa/drivers/dri/r300/r300_shader.c | 17
src/mesa/drivers/dri/r300/r300_state.c | 92
src/mesa/drivers/dri/r300/r300_tex.c | 40
src/mesa/drivers/dri/r300/r300_texstate.c | 67
src/mesa/drivers/dri/r300/r300_vertexprog.c | 482
src/mesa/drivers/dri/r300/radeon_context.c | 47
src/mesa/drivers/dri/r300/radeon_context.h | 10
src/mesa/drivers/dri/r300/radeon_ioctl.c | 26
src/mesa/drivers/dri/r300/radeon_lock.c | 82
src/mesa/drivers/dri/r300/radeon_mm.c | 2
src/mesa/drivers/dri/r300/radeon_state.c | 62
src/mesa/drivers/dri/r300/radeon_state.h | 2
src/mesa/drivers/dri/radeon/radeon_context.c | 33
src/mesa/drivers/dri/radeon/radeon_context.h | 11
src/mesa/drivers/dri/radeon/radeon_ioctl.c | 19
src/mesa/drivers/dri/radeon/radeon_lock.c | 14
src/mesa/drivers/dri/radeon/radeon_screen.c | 3
src/mesa/drivers/dri/radeon/radeon_state.c | 36
src/mesa/drivers/dri/radeon/radeon_texstate.c | 41
src/mesa/drivers/dri/s3v/s3v_dd.c | 22
src/mesa/drivers/dri/s3v/s3v_state.c | 13
src/mesa/drivers/dri/savage/savage_init.h | 13
src/mesa/drivers/dri/savage/savage_xmesa.c | 63
src/mesa/drivers/dri/savage/savagedd.c | 20
src/mesa/drivers/dri/savage/savageioctl.c | 13
src/mesa/drivers/dri/savage/savagespan.c | 11
src/mesa/drivers/dri/savage/savagestate.c | 26
src/mesa/drivers/dri/sis/sis6326_clear.c | 25
src/mesa/drivers/dri/sis/sis6326_state.c | 18
src/mesa/drivers/dri/sis/sis_clear.c | 33
src/mesa/drivers/dri/sis/sis_screen.c | 2
src/mesa/drivers/dri/sis/sis_state.c | 14
src/mesa/drivers/dri/sis/sis_state.h | 6
src/mesa/drivers/dri/tdfx/tdfx_context.c | 28
src/mesa/drivers/dri/tdfx/tdfx_context.h | 12
src/mesa/drivers/dri/tdfx/tdfx_dd.c | 135
src/mesa/drivers/dri/tdfx/tdfx_lock.c | 23
src/mesa/drivers/dri/tdfx/tdfx_pixels.c | 12
src/mesa/drivers/dri/tdfx/tdfx_render.c | 9
src/mesa/drivers/dri/tdfx/tdfx_screen.c | 14
src/mesa/drivers/dri/tdfx/tdfx_span.c | 29
src/mesa/drivers/dri/tdfx/tdfx_state.c | 13
src/mesa/drivers/dri/tdfx/tdfx_tex.c | 15
src/mesa/drivers/dri/tdfx/tdfx_texstate.c | 5
src/mesa/drivers/dri/trident/trident_context.c | 1
src/mesa/drivers/dri/trident/trident_dd.c | 23
src/mesa/drivers/dri/trident/trident_state.c | 28
src/mesa/drivers/dri/unichrome/via_context.c | 170
src/mesa/drivers/dri/unichrome/via_context.h | 33
src/mesa/drivers/dri/unichrome/via_ioctl.c | 48
src/mesa/drivers/dri/unichrome/via_screen.c | 10
src/mesa/drivers/dri/unichrome/via_span.c | 10
src/mesa/drivers/dri/unichrome/via_state.c | 37
src/mesa/drivers/dri/unichrome/via_tex.c | 8
src/mesa/drivers/fbdev/glfbdev.c | 20
src/mesa/drivers/ggi/ggimesa.c | 22
src/mesa/drivers/glide/fxdd.c | 21
src/mesa/drivers/osmesa/osmesa.c | 213
src/mesa/drivers/svga/svgamesa.c | 14
src/mesa/drivers/svga/svgamesa15.c | 12
src/mesa/drivers/svga/svgamesa16.c | 12
src/mesa/drivers/svga/svgamesa24.c | 12
src/mesa/drivers/svga/svgamesa32.c | 12
src/mesa/drivers/svga/svgamesa8.c | 12
src/mesa/drivers/windows/gdi/wmesa.c | 17
src/mesa/drivers/x11/fakeglx.c | 11
src/mesa/drivers/x11/glxapi.c | 37
src/mesa/drivers/x11/sources | 8
src/mesa/drivers/x11/xm_api.c | 674 -
src/mesa/drivers/x11/xm_buffer.c | 216
src/mesa/drivers/x11/xm_dd.c | 364
src/mesa/drivers/x11/xm_span.c | 8
src/mesa/drivers/x11/xmesaP.h | 115
src/mesa/glapi/Makefile | 14
src/mesa/glapi/dispatch.h | 961 -
src/mesa/glapi/glX_XML.py | 58
src/mesa/glapi/glX_proto_recv.py | 30
src/mesa/glapi/glX_proto_send.py | 314
src/mesa/glapi/glX_proto_size.py | 10
src/mesa/glapi/glX_server_table.py | 11
src/mesa/glapi/gl_API.dtd | 4
src/mesa/glapi/gl_API.xml | 900 +
src/mesa/glapi/gl_SPARC_asm.py | 17
src/mesa/glapi/gl_XML.py | 167
src/mesa/glapi/gl_apitemp.py | 19
src/mesa/glapi/gl_enums.py | 2
src/mesa/glapi/gl_procs.py | 89
src/mesa/glapi/gl_x86-64_asm.py | 18
src/mesa/glapi/gl_x86_asm.py | 18
src/mesa/glapi/glapi.c | 14
src/mesa/glapi/glapioffsets.h | 766 -
src/mesa/glapi/glapitable.h | 725 -
src/mesa/glapi/glapitemp.h | 1065 +
src/mesa/glapi/glprocs.h | 2262 ++-
src/mesa/glapi/glthread.h | 8
src/mesa/glapi/sources | 12
src/mesa/main/accum.c | 6
src/mesa/main/api_arrayelt.c | 113
src/mesa/main/api_arrayelt.h | 5
src/mesa/main/api_loopback.c | 2
src/mesa/main/attrib.c | 13
src/mesa/main/blend.c | 31
src/mesa/main/blend.h | 9
src/mesa/main/bufferobj.c | 9
src/mesa/main/buffers.c | 47
src/mesa/main/buffers.h | 2
src/mesa/main/colortab.c | 330
src/mesa/main/colortab.h | 14
src/mesa/main/config.h | 9
src/mesa/main/context.c | 57
src/mesa/main/context.h | 8
src/mesa/main/convolve.c | 35
src/mesa/main/dd.h | 54
src/mesa/main/descrip.mms | 3
src/mesa/main/dlist.c | 22
src/mesa/main/enums.c | 5939 +++++-----
src/mesa/main/extensions.c | 5
src/mesa/main/fbobject.c | 33
src/mesa/main/framebuffer.c | 9
src/mesa/main/get.c | 39
src/mesa/main/get_gen.py | 13
src/mesa/main/getstring.c | 25
src/mesa/main/histogram.c | 4
src/mesa/main/image.c | 450
src/mesa/main/image.h | 42
src/mesa/main/imports.h | 22
src/mesa/main/light.c | 1
src/mesa/main/macros.h | 24
src/mesa/main/mipmap.c | 1147 +
src/mesa/main/mipmap.h | 52
src/mesa/main/mm.c | 2
src/mesa/main/mtypes.h | 88
src/mesa/main/pixel.c | 790 -
src/mesa/main/pixel.h | 42
src/mesa/main/rastpos.c | 1
src/mesa/main/sources | 138
src/mesa/main/state.c | 67
src/mesa/main/state.h | 6
src/mesa/main/stencil.c | 19
src/mesa/main/texcompress.c | 1
src/mesa/main/texcompress_fxt1.c | 5
src/mesa/main/texcompress_s3tc.c | 6
src/mesa/main/texenvprogram.c | 57
src/mesa/main/texformat_tmp.h | 119
src/mesa/main/teximage.c | 1088 +
src/mesa/main/teximage.h | 21
src/mesa/main/texobj.c | 39
src/mesa/main/texobj.h | 4
src/mesa/main/texstate.c | 125
src/mesa/main/texstore.c | 1742 --
src/mesa/main/texstore.h | 21
src/mesa/main/version.h | 6
src/mesa/math/sources | 25
src/mesa/shader/arbprogparse.c | 27
src/mesa/shader/arbprogram.c | 41
src/mesa/shader/arbprogram.h | 8
src/mesa/shader/atifragshader.c | 2
src/mesa/shader/descrip.mms | 7
src/mesa/shader/grammar/grammar.c | 49
src/mesa/shader/grammar/sources | 8
src/mesa/shader/nvfragparse.c | 10
src/mesa/shader/nvprogram.c | 33
src/mesa/shader/nvvertexec.c | 351
src/mesa/shader/nvvertexec.h | 34
src/mesa/shader/nvvertparse.c | 12
src/mesa/shader/program.c | 346
src/mesa/shader/program.h | 30
src/mesa/shader/program_instruction.h | 9
src/mesa/shader/programopt.c | 196
src/mesa/shader/programopt.h | 2
src/mesa/shader/shaderobjects.c | 1723 +-
src/mesa/shader/shaderobjects.h | 75
src/mesa/shader/shaderobjects_3dlabs.c | 2620 ++--
src/mesa/shader/slang/library/Makefile | 85
src/mesa/shader/slang/library/gc_to_bin.c | 41
src/mesa/shader/slang/library/slang_builtin_120_common.gc | 6
src/mesa/shader/slang/library/slang_pp_directives.syn | 385
src/mesa/shader/slang/library/slang_pp_directives_syn.h | 239
src/mesa/shader/slang/library/slang_pp_expression.syn | 265
src/mesa/shader/slang/library/slang_pp_expression_syn.h | 179
src/mesa/shader/slang/library/slang_pp_version.syn | 4
src/mesa/shader/slang/library/slang_shader_syn.h | 3
src/mesa/shader/slang/slang_analyse.c | 4
src/mesa/shader/slang/slang_assemble.c | 2473 ++--
src/mesa/shader/slang/slang_assemble.h | 288
src/mesa/shader/slang/slang_assemble_assignment.c | 184
src/mesa/shader/slang/slang_assemble_assignment.h | 17
src/mesa/shader/slang/slang_assemble_constructor.c | 628 -
src/mesa/shader/slang/slang_assemble_constructor.h | 45
src/mesa/shader/slang/slang_assemble_typeinfo.c | 1036 -
src/mesa/shader/slang/slang_assemble_typeinfo.h | 138
src/mesa/shader/slang/slang_compile.c | 3166 ++---
src/mesa/shader/slang/slang_compile_function.c | 252
src/mesa/shader/slang/slang_compile_function.h | 80
src/mesa/shader/slang/slang_compile_operation.c | 125
src/mesa/shader/slang/slang_compile_operation.h | 173
src/mesa/shader/slang/slang_compile_variable.c | 574
src/mesa/shader/slang/slang_compile_variable.h | 119
src/mesa/shader/slang/slang_execute.c | 1032 -
src/mesa/shader/slang/slang_execute.h | 66
src/mesa/shader/slang/slang_execute_x86.c | 1114 -
src/mesa/shader/slang/slang_link.c | 1178 +-
src/mesa/shader/slang/slang_link.h | 383
src/mesa/shader/slang/slang_preprocess.c | 1100 +
src/mesa/shader/slang/slang_preprocess.h | 5
src/mesa/shader/slang/slang_utility.c | 222
src/mesa/shader/slang/slang_utility.h | 38
src/mesa/shader/slang/sources | 44
src/mesa/shader/sources | 28
src/mesa/sources | 3
src/mesa/sparc/glapi_sparc.S | 242
src/mesa/sparc/sparc.c | 2
src/mesa/swrast/s_aaline.c | 2
src/mesa/swrast/s_aatritemp.h | 10
src/mesa/swrast/s_accum.c | 47
src/mesa/swrast/s_alpha.c | 270
src/mesa/swrast/s_alpha.h | 2
src/mesa/swrast/s_arbshader.c | 52
src/mesa/swrast/s_arbshader.h | 2
src/mesa/swrast/s_atifragshader.c | 108
src/mesa/swrast/s_atifragshader.h | 2
src/mesa/swrast/s_bitmap.c | 43
src/mesa/swrast/s_blend.c | 1023 -
src/mesa/swrast/s_blend.h | 9
src/mesa/swrast/s_buffers.c | 100
src/mesa/swrast/s_context.c | 69
src/mesa/swrast/s_context.h | 78
src/mesa/swrast/s_copypix.c | 331
src/mesa/swrast/s_depth.c | 8
src/mesa/swrast/s_depth.h | 4
src/mesa/swrast/s_drawpix.c | 687 -
src/mesa/swrast/s_fog.c | 241
src/mesa/swrast/s_fog.h | 4
src/mesa/swrast/s_imaging.c | 8
src/mesa/swrast/s_lines.c | 2
src/mesa/swrast/s_linetemp.h | 2
src/mesa/swrast/s_logic.c | 110
src/mesa/swrast/s_logic.h | 8
src/mesa/swrast/s_masking.c | 158
src/mesa/swrast/s_masking.h | 23
src/mesa/swrast/s_nvfragprog.c | 620 -
src/mesa/swrast/s_nvfragprog.h | 2
src/mesa/swrast/s_pointtemp.h | 20
src/mesa/swrast/s_readpix.c | 235
src/mesa/swrast/s_span.c | 1088 +
src/mesa/swrast/s_span.h | 23
src/mesa/swrast/s_stencil.c | 6
src/mesa/swrast/s_stencil.h | 2
src/mesa/swrast/s_texcombine.c | 10
src/mesa/swrast/s_texcombine.h | 2
src/mesa/swrast/s_texfilter.c | 6
src/mesa/swrast/s_texstore.c | 77
src/mesa/swrast/s_triangle.c | 29
src/mesa/swrast/s_tritemp.h | 2
src/mesa/swrast/s_zoom.c | 137
src/mesa/swrast/s_zoom.h | 10
src/mesa/swrast/sources | 65
src/mesa/swrast/swrast.h | 14
src/mesa/swrast_setup/sources | 10
src/mesa/tnl/sources | 46
src/mesa/tnl/t_array_api.c | 20
src/mesa/tnl/t_array_import.c | 5
src/mesa/tnl/t_context.c | 10
src/mesa/tnl/t_context.h | 1
src/mesa/tnl/t_save_api.c | 8
src/mesa/tnl/t_save_playback.c | 1
src/mesa/tnl/t_vb_arbprogram.c | 5
src/mesa/tnl/t_vb_cliptmp.h | 17
src/mesa/tnl/t_vb_program.c | 14
src/mesa/tnl/t_vp_build.c | 4
src/mesa/tnl/t_vtx_api.c | 24
src/mesa/tnl/t_vtx_exec.c | 5
src/mesa/x86-64/glapi_x86-64.S | 4659 ++++---
src/mesa/x86-64/x86-64.c | 7
src/mesa/x86/glapi_x86.S | 295
src/mesa/x86/mmx.h | 21
windows/VC6/mesa/mesa/mesa.dsp | 4
windows/VC7/mesa/mesa/mesa.vcproj | 3
569 files changed, 71821 insertions(+), 30699 deletions(-)
New commits:
commit eb667b979bc941f05b8f40a2fc39af6fac960ac5
Author: Brian Paul <brian.paul@tungstengraphics.com>
Date: Sat Dec 2 18:20:53 2006 +0000
remove directfbgl.h file
diff --git a/Makefile b/Makefile
index b95cedd..7478488 100644
--- a/Makefile
+++ b/Makefile
@@ -174,7 +174,6 @@ MAIN_FILES = \
$(DIRECTORY)/include/GL/internal/glcore.h \
$(DIRECTORY)/include/GL/amesa.h \
$(DIRECTORY)/include/GL/dmesa.h \
- $(DIRECTORY)/include/GL/directfbgl.h \
$(DIRECTORY)/include/GL/fxmesa.h \
$(DIRECTORY)/include/GL/ggimesa.h \
$(DIRECTORY)/include/GL/gl.h \
commit b98c1e4a4b765c02da6c5e8d7a4d2f58330d28e5
Author: Brian Paul <brian.paul@tungstengraphics.com>
Date: Sat Dec 2 18:18:55 2006 +0000
remove bogus link
diff --git a/docs/relnotes-6.5.1.html b/docs/relnotes-6.5.1.html
index b053203..0f03f93 100644
--- a/docs/relnotes-6.5.1.html
+++ b/docs/relnotes-6.5.1.html
@@ -12,7 +12,7 @@
<p>
Mesa 6.5.1 is a 6.5 follow-on development release mostly consisting of
-<a href="versions.html#6.5.1">bug fixes</a>.
+bug fixes.
</p>
commit f10acf8b7890e6cfc4c2c2c8b778cad66f5ab0e4
Author: Brian Paul <brian.paul@tungstengraphics.com>
Date: Sat Dec 2 18:18:41 2006 +0000
6.5.2 release updates
diff --git a/docs/news.html b/docs/news.html
index 9cd622f..c5f68a6 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -11,6 +11,12 @@
<H1>News</H1>
+<h2>December 2, 2006</h2>
+<p>
+<a href="relnotes-6.5.2.html">Mesa 6.5.2</a> has been released.
+This is a new development release.
+</p>
+
<h2>September 15, 2006</h2>
<p>
<a href="relnotes-6.5.1.html">Mesa 6.5.1</a> has been released.
@@ -1070,6 +1076,6 @@ source code</a>.</p>
<hr>
-$Id: news.html,v 3.32 2006/09/21 22:51:16 brianp Exp $
+$Id: news.html,v 3.33 2006/12/02 18:18:41 brianp Exp $
</body>
</html>
diff --git a/docs/relnotes-6.5.2.html b/docs/relnotes-6.5.2.html
index a8eb970..c4597c9 100644
--- a/docs/relnotes-6.5.2.html
+++ b/docs/relnotes-6.5.2.html
@@ -8,11 +8,11 @@
<body bgcolor="#eeeeee">
-<H1>Mesa 6.5.2 Release Notes / (in progress)</H1>
+<H1>Mesa 6.5.2 Release Notes / December 2, 2006</H1>
<p>
-Mesa 6.5.2 is a 6.5 follow-on development release mostly consisting of
-<a href="versions.html#6.5.1">bug fixes</a>.
+Mesa 6.5.2 is a 6.5 follow-on development release with a few new features
+but mostly consisting of bug fixes.
</p>
commit 50a81669ba60615689edd26853003b64f180189f
Author: Gary Wong <gtw@gnu.org>
Date: Sat Dec 2 02:20:05 2006 +0000
Add i915tex and i965.
diff --git a/configs/linux-dri-x86-64 b/configs/linux-dri-x86-64
index 4fbd0a0..821ab3e 100644
--- a/configs/linux-dri-x86-64
+++ b/configs/linux-dri-x86-64
@@ -20,5 +20,5 @@ EXTRA_LIB_PATH=-L/usr/X11R6/lib64
# the new interface. i810 are missing because there is no x86-64
# system where they could *ever* be used.
#
-DRI_DIRS = i915 mach64 mga r128 r200 radeon tdfx unichrome savage r300
+DRI_DIRS = i915tex i915 i965 mach64 mga r128 r200 radeon tdfx unichrome savage r300
commit 7a43a6b4ff8377f260f5525062bc2f66c05570e1
Author: Gary Wong <gtw@gnu.org>
Date: Sat Dec 2 01:13:06 2006 +0000
Structure CopyPixels similarly to i915 do_texture_copypixels, to ease future unification.
diff --git a/src/mesa/drivers/dri/i965/brw_metaops.c b/src/mesa/drivers/dri/i965/brw_metaops.c
index ca8e1d3..2deec5e 100644
--- a/src/mesa/drivers/dri/i965/brw_metaops.c
+++ b/src/mesa/drivers/dri/i965/brw_metaops.c
@@ -95,26 +95,22 @@ static void init_attribs( struct brw_context *brw )
DUP(brw, gl_fragment_program_state, FragmentProgram);
}
-static void install_vertex_attribs( struct brw_context *brw )
+static void install_attribs( struct brw_context *brw )
{
+ INSTALL(brw, Color, _NEW_COLOR);
+ INSTALL(brw, Depth, _NEW_DEPTH);
+ INSTALL(brw, Fog, _NEW_FOG);
INSTALL(brw, Hint, _NEW_HINT);
INSTALL(brw, Light, _NEW_LIGHT);
INSTALL(brw, Line, _NEW_LINE);
INSTALL(brw, Point, _NEW_POINT);
INSTALL(brw, Polygon, _NEW_POLYGON);
- INSTALL(brw, Transform, _NEW_TRANSFORM);
- INSTALL(brw, Viewport, _NEW_VIEWPORT);
- INSTALL(brw, VertexProgram, _NEW_PROGRAM);
-}
-
-static void install_fragment_attribs( struct brw_context *brw )
-{
- INSTALL(brw, Color, _NEW_COLOR);
- INSTALL(brw, Depth, _NEW_DEPTH);
- INSTALL(brw, Fog, _NEW_FOG);
INSTALL(brw, Scissor, _NEW_SCISSOR);
INSTALL(brw, Stencil, _NEW_STENCIL);
INSTALL(brw, Texture, _NEW_TEXTURE);
+ INSTALL(brw, Transform, _NEW_TRANSFORM);
+ INSTALL(brw, Viewport, _NEW_VIEWPORT);
+ INSTALL(brw, VertexProgram, _NEW_PROGRAM);
INSTALL(brw, FragmentProgram, _NEW_PROGRAM);
}
@@ -301,6 +297,36 @@ static void meta_no_texture( struct intel_context *intel )
brw->state.dirty.mesa |= _NEW_TEXTURE | _NEW_PROGRAM;
}
+static void meta_texture_blend_replace(struct intel_context *intel)
+{
+ struct brw_context *brw = brw_context(&intel->ctx);
+
+ brw->metaops.attribs.Texture->CurrentUnit = 0;
+ brw->metaops.attribs.Texture->_EnabledUnits = 1;
+ brw->metaops.attribs.Texture->_EnabledCoordUnits = 1;
+ brw->metaops.attribs.Texture->Unit[ 0 ].Enabled = TEXTURE_2D_BIT;
+ brw->metaops.attribs.Texture->Unit[ 0 ]._ReallyEnabled = TEXTURE_2D_BIT;
+ brw->metaops.attribs.Texture->Unit[ 0 ].Current2D =
+ intel->frame_buffer_texobj;
+ brw->metaops.attribs.Texture->Unit[ 0 ]._Current =
+ intel->frame_buffer_texobj;
+
+ brw->state.dirty.mesa |= _NEW_TEXTURE | _NEW_PROGRAM;
+}
+
+static void meta_import_pixel_state(struct intel_context *intel)
+{
+ struct brw_context *brw = brw_context(&intel->ctx);
+
+ RESTORE(brw, Color, _NEW_COLOR);
+ RESTORE(brw, Depth, _NEW_DEPTH);
+ RESTORE(brw, Fog, _NEW_FOG);
+ RESTORE(brw, Scissor, _NEW_SCISSOR);
+ RESTORE(brw, Stencil, _NEW_STENCIL);
+ RESTORE(brw, Texture, _NEW_TEXTURE);
+ RESTORE(brw, FragmentProgram, _NEW_PROGRAM);
+}
+
static void meta_frame_buffer_texture( struct intel_context *intel,
GLint xoff, GLint yoff )
{
@@ -327,17 +353,7 @@ static void meta_frame_buffer_texture( struct intel_context *intel,
brw->metaops.fp_tex->Base.LocalParams[ 1 ][ 2 ] = 0.0;
brw->metaops.fp_tex->Base.LocalParams[ 1 ][ 3 ] = 1.0;
- brw->metaops.attribs.Texture->CurrentUnit = 0;
- brw->metaops.attribs.Texture->_EnabledUnits = 1;
- brw->metaops.attribs.Texture->_EnabledCoordUnits = 1;
- brw->metaops.attribs.Texture->Unit[ 0 ].Enabled = TEXTURE_2D_BIT;
- brw->metaops.attribs.Texture->Unit[ 0 ]._ReallyEnabled = TEXTURE_2D_BIT;
- brw->metaops.attribs.Texture->Unit[ 0 ].Current2D =
- intel->frame_buffer_texobj;
- brw->metaops.attribs.Texture->Unit[ 0 ]._Current =
- intel->frame_buffer_texobj;
-
- brw->state.dirty.mesa |= _NEW_TEXTURE | _NEW_PROGRAM;
+ brw->state.dirty.mesa |= _NEW_PROGRAM;
}
@@ -486,9 +502,7 @@ static void install_meta_state( struct intel_context *intel,
init_metaops_state(brw);
}
- install_vertex_attribs(brw);
- if( state == META_FULL )
- install_fragment_attribs(brw);
+ install_attribs(brw);
meta_no_texture(&brw->intel);
meta_flat_shade(&brw->intel);
@@ -539,11 +553,11 @@ void brw_init_metaops( struct brw_context *brw )
brw->intel.vtbl.meta_depth_replace = meta_depth_replace;
brw->intel.vtbl.meta_color_mask = meta_color_mask;
brw->intel.vtbl.meta_no_texture = meta_no_texture;
+ brw->intel.vtbl.meta_import_pixel_state = meta_import_pixel_state;
brw->intel.vtbl.meta_frame_buffer_texture = meta_frame_buffer_texture;
brw->intel.vtbl.meta_draw_region = meta_draw_region;
brw->intel.vtbl.meta_draw_quad = meta_draw_quad;
-
-/* brw->intel.vtbl.meta_texture_blend_replace = meta_texture_blend_replace; */
+ brw->intel.vtbl.meta_texture_blend_replace = meta_texture_blend_replace;
/* brw->intel.vtbl.meta_tex_rect_source = meta_tex_rect_source; */
/* brw->intel.vtbl.meta_draw_format = set_draw_format; */
}
diff --git a/src/mesa/drivers/dri/i965/intel_buffers.c b/src/mesa/drivers/dri/i965/intel_buffers.c
index 645ac8e..d155c03 100644
--- a/src/mesa/drivers/dri/i965/intel_buffers.c
+++ b/src/mesa/drivers/dri/i965/intel_buffers.c
@@ -235,7 +235,7 @@ static void intelClearWithTris(struct intel_context *intel,
{
- intel->vtbl.install_meta_state(intel, META_FULL);
+ intel->vtbl.install_meta_state(intel);
/* Get clear bounds after locking */
cx = ctx->DrawBuffer->_Xmin;
diff --git a/src/mesa/drivers/dri/i965/intel_context.h b/src/mesa/drivers/dri/i965/intel_context.h
index a8f7a61..8367a95 100644
--- a/src/mesa/drivers/dri/i965/intel_context.h
+++ b/src/mesa/drivers/dri/i965/intel_context.h
@@ -86,12 +86,6 @@ struct intel_texture_object
-/* Identifiers for use with install_meta_state below */
-enum
-{
- META_FULL, META_VERTEX_ONLY
-};
-
struct intel_context
{
GLcontext ctx; /* the parent class */
@@ -137,8 +131,7 @@ struct intel_context
/* Metaops:
*/
- void (*install_meta_state)( struct intel_context *intel,
- GLenum state );
+ void (*install_meta_state)( struct intel_context *intel );
void (*leave_meta_state)( struct intel_context *intel );
void (*meta_draw_region)( struct intel_context *intel,
@@ -154,9 +147,12 @@ struct intel_context
void (*meta_depth_replace)( struct intel_context *intel );
+ void (*meta_texture_blend_replace) (struct intel_context * intel);
+
void (*meta_no_stencil_write)( struct intel_context *intel );
void (*meta_no_depth_write)( struct intel_context *intel );
void (*meta_no_texture)( struct intel_context *intel );
+ void (*meta_import_pixel_state) (struct intel_context * intel);
void (*meta_frame_buffer_texture)( struct intel_context *intel,
GLint xoff, GLint yoff );
diff --git a/src/mesa/drivers/dri/i965/intel_pixel_copy.c b/src/mesa/drivers/dri/i965/intel_pixel_copy.c
index 0279311..58dc495 100644
--- a/src/mesa/drivers/dri/i965/intel_pixel_copy.c
+++ b/src/mesa/drivers/dri/i965/intel_pixel_copy.c
@@ -95,7 +95,107 @@ intel_check_blit_fragment_ops(GLcontext * ctx)
ctx->Color.BlendEnabled);
}
+/* Doesn't work for overlapping regions. Could do a double copy or
+ * just fallback.
+ */
+static GLboolean
+do_texture_copypixels(GLcontext * ctx,
+ GLint srcx, GLint srcy,
+ GLsizei width, GLsizei height,
+ GLint dstx, GLint dsty, GLenum type)
+{
+ struct intel_context *intel = intel_context(ctx);
+ struct intel_region *dst = intel_drawbuf_region(intel);
+ struct intel_region *src = copypix_src_region(intel, type);
+ GLenum src_format;
+ GLenum src_type;
+
+ DBG("%s %d,%d %dx%d --> %d,%d\n", __FUNCTION__,
+ srcx, srcy, width, height, dstx, dsty);
+ if (!src || !dst || type != GL_COLOR ||
+ ctx->_ImageTransferState ||
+ ctx->Pixel.ZoomX != 1.0F || ctx->Pixel.ZoomY != 1.0F ||
+ ctx->RenderMode != GL_RENDER ||
+ ctx->Texture._EnabledUnits ||
+ ctx->FragmentProgram._Enabled ||
+ src != dst )
+ return GL_FALSE;
+
+ /* Can't handle overlapping regions. Don't have sufficient control
+ * over rasterization to pull it off in-place. Punt on these for
+ * now.
+ *
+ * XXX: do a copy to a temporary.
+ */
+ if (src->buffer == dst->buffer) {
+ drm_clip_rect_t srcbox;
+ drm_clip_rect_t dstbox;
+ drm_clip_rect_t tmp;
+
+ srcbox.x1 = srcx;
+ srcbox.y1 = srcy;
+ srcbox.x2 = srcx + width - 1;
+ srcbox.y2 = srcy + height - 1;
+
+ dstbox.x1 = dstx;
+ dstbox.y1 = dsty;
+ dstbox.x2 = dstx + width - 1;
+ dstbox.y2 = dsty + height - 1;
+
+ DBG("src %d,%d %d,%d\n", srcbox.x1, srcbox.y1, srcbox.x2, srcbox.y2);
+ DBG("dst %d,%d %d,%d (%dx%d) (%f,%f)\n", dstbox.x1, dstbox.y1, dstbox.x2, dstbox.y2,
+ width, height, ctx->Pixel.ZoomX, ctx->Pixel.ZoomY);
+
+ if (intel_intersect_cliprects(&tmp, &srcbox, &dstbox)) {
+ DBG("%s: regions overlap\n", __FUNCTION__);
+ return GL_FALSE;
+ }
+ }
+
+ intelFlush(&intel->ctx);
+
+ intel->vtbl.install_meta_state(intel);
+
+ /* Is this true? Also will need to turn depth testing on according
+ * to state:
+ */
+ intel->vtbl.meta_no_stencil_write(intel);
+ intel->vtbl.meta_no_depth_write(intel);
+
+ /* Set the 3d engine to draw into the destination region:
+ */
+ intel->vtbl.meta_draw_region(intel, dst, intel->depth_region);
+
+ intel->vtbl.meta_import_pixel_state(intel);
+
+ if (src->cpp == 2) {
+ src_format = GL_RGB;
+ src_type = GL_UNSIGNED_SHORT_5_6_5;
+ }
+ else {
+ src_format = GL_BGRA;
+ src_type = GL_UNSIGNED_BYTE;
+ }
+
+ /* Set the frontbuffer up as a large rectangular texture.
+ */
+ intel->vtbl.meta_frame_buffer_texture( intel, srcx - dstx, srcy - dsty );
+
+ intel->vtbl.meta_texture_blend_replace(intel);
+
+ if (intel->driDrawable->numClipRects)
+ intel->vtbl.meta_draw_quad( intel,
+ dstx, dstx + width,
+ dsty, dsty + height,
+ ctx->Current.RasterPos[ 2 ],
+ 0, 0, 0, 0, 0.0, 0.0, 0.0, 0.0 );
+
+ intel->vtbl.leave_meta_state( intel );
+
+ DBG("%s: success\n", __FUNCTION__);
+ return GL_TRUE;
+}
/**
* CopyPixels with the blitter. Don't support zooming, pixel transfer, etc.
@@ -221,65 +321,6 @@ do_blit_copypixels(GLcontext * ctx,
return GL_TRUE;
}
-/**
- * CopyPixels with metaops. We can support (most) fragment options that way.
- */
-static GLboolean
-do_meta_copypixels(GLcontext * ctx,
- GLint srcx, GLint srcy,
- GLsizei width, GLsizei height,
- GLint dstx, GLint dsty, GLenum type)
-{
- struct intel_context *intel = intel_context(ctx);
-
- /* We're going to cheat and use texturing to get the source region
- * duplicated. Trying to cope with the case where texturing is
- * already applied to fragments would be messy (and it's an unusual
- * thing to want anyway), so we leave that to swrast.
- *
- * We don't want to worry about any case other than GL_COLOR, either
- * (though we could, with a bit more work).
- *
- * PixelMap, PixelTransfer, PixelZoom etc. could also be handled with
- * a bit more intelligence in metaops.
- */
- if( ctx->_ImageTransferState ||
- ctx->Pixel.ZoomX != 1.0F || ctx->Pixel.ZoomY != 1.0F ||
- ctx->RenderMode != GL_RENDER ||
- ctx->Texture._EnabledUnits ||
Reply to: