← Back to branch summary

~ubuntu-branches/ubuntu/lucid/mesa/lucid

~ubuntu-branches/ubuntu/lucid/mesa/lucid

« back to all changes in this revision

Viewing changes to src/gallium/state_trackers/xorg/xorg_dri2.c

Committer: Bazaar Package Importer
Author(s): Timo Aaltonen, Alberto Milone
Date: 2010-04-01 13:31:09 UTC
mfrom: (1.2.25 upstream) (3.3.5 sid)
Revision ID: james.westby@ubuntu.com-20100401133109-8artfla74n44ng23

Tags: 7.7.1-1ubuntu1

https://launchpad.net/bugs/248392

[ Alberto Milone ]
debian/rules: pass --with-dri-searchpath=/usr/lib/dri:/usr/lib32/dri
to confflags-dri on i386 so that /usr/lib32/dri is used for 32 bit
compatibility on 64 bit systems (LP: #248392).

files removed:
include/GL/glut.h

include/GL/glutf90.h

src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c

src/glut

src/glut/beos

src/glut/beos/Makefile

src/glut/beos/beos_x11.cpp

src/glut/beos/beos_x11.h

src/glut/beos/glutBlocker.cpp

src/glut/beos/glutBlocker.h

src/glut/beos/glutCallback.cpp

src/glut/beos/glutColor.cpp

src/glut/beos/glutCursor.cpp

src/glut/beos/glutCursors.h

src/glut/beos/glutDstr.cpp

src/glut/beos/glutEvent.cpp

src/glut/beos/glutGet.cpp

src/glut/beos/glutInit.cpp

src/glut/beos/glutMenu.cpp

src/glut/beos/glutMenu.h

src/glut/beos/glutOverlay.cpp

src/glut/beos/glutState.h

src/glut/beos/glutWindow.cpp

src/glut/beos/glutWindow.h

src/glut/beos/glut_8x13.c

src/glut/beos/glut_9x15.c

src/glut/beos/glut_bitmap.c

src/glut/beos/glut_bwidth.c

src/glut/beos/glut_ext.c

src/glut/beos/glut_hel10.c

src/glut/beos/glut_hel12.c

src/glut/beos/glut_hel18.c

src/glut/beos/glut_mroman.c

src/glut/beos/glut_roman.c

src/glut/beos/glut_shapes.c

src/glut/beos/glut_stroke.c

src/glut/beos/glut_swidth.c

src/glut/beos/glut_teapot.c

src/glut/beos/glut_tr10.c

src/glut/beos/glut_tr24.c

src/glut/beos/glut_util.c

src/glut/beos/glut_vidresize.c

src/glut/beos/glutbitmap.h

src/glut/beos/glutint.h

src/glut/beos/glutstroke.h

src/glut/directfb

src/glut/directfb/Makefile

src/glut/directfb/NOTES

src/glut/directfb/callback.c

src/glut/directfb/color.c

src/glut/directfb/cursor.c

src/glut/directfb/cursors.h

src/glut/directfb/events.c

src/glut/directfb/ext.c

src/glut/directfb/font.c

src/glut/directfb/font.h

src/glut/directfb/game.c

src/glut/directfb/globals.c

src/glut/directfb/init.c

src/glut/directfb/internal.h

src/glut/directfb/menu.c

src/glut/directfb/models.c

src/glut/directfb/overlay.c

src/glut/directfb/state.c

src/glut/directfb/teapot.c

src/glut/directfb/window.c

src/glut/dos

src/glut/dos/PC_HW

src/glut/dos/PC_HW/pc_hw.c

src/glut/dos/PC_HW/pc_hw.h

src/glut/dos/PC_HW/pc_irq.S

src/glut/dos/PC_HW/pc_keyb.c

src/glut/dos/PC_HW/pc_mouse.c

src/glut/dos/PC_HW/pc_timer.c

src/glut/dos/bitmap.c

src/glut/dos/callback.c

src/glut/dos/color.c

src/glut/dos/extens.c

src/glut/dos/f8x13.c

src/glut/dos/f9x15.c

src/glut/dos/hel10.c

src/glut/dos/hel12.c

src/glut/dos/hel18.c

src/glut/dos/init.c

src/glut/dos/internal.h

src/glut/dos/loop.c

src/glut/dos/menu.c

src/glut/dos/mouse.c

src/glut/dos/mroman.c

src/glut/dos/overlay.c

src/glut/dos/roman.c

src/glut/dos/shapes.c

src/glut/dos/state.c

src/glut/dos/stroke.c

src/glut/dos/teapot.c

src/glut/dos/tr10.c

src/glut/dos/tr24.c

src/glut/dos/util.c

src/glut/dos/window.c

src/glut/fbdev

src/glut/fbdev/Makefile

src/glut/fbdev/bitmap.c

src/glut/fbdev/callback.c

src/glut/fbdev/colormap.c

src/glut/fbdev/cursor.c

src/glut/fbdev/cursors.h

src/glut/fbdev/ext.c

src/glut/fbdev/fbdev.c

src/glut/fbdev/gamemode.c

src/glut/fbdev/input.c

src/glut/fbdev/internal.h

src/glut/fbdev/menu.c

src/glut/fbdev/overlay.c

src/glut/fbdev/state.c

src/glut/fbdev/stroke.c

src/glut/fbdev/vidresize.c

src/glut/ggi

src/glut/ggi/Makefile

src/glut/ggi/debug.h

src/glut/ggi/ggiglut.c

src/glut/glx

src/glut/glx/Makefile

src/glut/glx/Makefile.cygnus

src/glut/glx/Makefile.mgw

src/glut/glx/Makefile.sgi

src/glut/glx/Makefile.win

src/glut/glx/capturexfont.c

src/glut/glx/depend

src/glut/glx/fxglut.def

src/glut/glx/glut.def

src/glut/glx/glut.pc.in

src/glut/glx/glut_8x13.c

src/glut/glx/glut_9x15.c

src/glut/glx/glut_bitmap.c

src/glut/glx/glut_bwidth.c

src/glut/glx/glut_cindex.c

src/glut/glx/glut_cmap.c

src/glut/glx/glut_cursor.c

src/glut/glx/glut_dials.c

src/glut/glx/glut_dstr.c

src/glut/glx/glut_event.c

src/glut/glx/glut_ext.c

src/glut/glx/glut_fcb.c

src/glut/glx/glut_fullscrn.c

src/glut/glx/glut_gamemode.c

src/glut/glx/glut_get.c

src/glut/glx/glut_glxext.c

src/glut/glx/glut_hel10.c

src/glut/glx/glut_hel12.c

src/glut/glx/glut_hel18.c

src/glut/glx/glut_init.c

src/glut/glx/glut_input.c

src/glut/glx/glut_joy.c

src/glut/glx/glut_key.c

src/glut/glx/glut_keyctrl.c

src/glut/glx/glut_keyup.c

src/glut/glx/glut_menu.c

src/glut/glx/glut_menu2.c

src/glut/glx/glut_mesa.c

src/glut/glx/glut_modifier.c

src/glut/glx/glut_mroman.c

src/glut/glx/glut_overlay.c

src/glut/glx/glut_ppm.c

src/glut/glx/glut_roman.c

src/glut/glx/glut_shapes.c

src/glut/glx/glut_space.c

src/glut/glx/glut_stroke.c

src/glut/glx/glut_swap.c

src/glut/glx/glut_swidth.c

src/glut/glx/glut_tablet.c

src/glut/glx/glut_teapot.c

src/glut/glx/glut_tr10.c

src/glut/glx/glut_tr24.c

src/glut/glx/glut_util.c

src/glut/glx/glut_vidresize.c

src/glut/glx/glut_warp.c

src/glut/glx/glut_win.c

src/glut/glx/glut_winmisc.c

src/glut/glx/glutbitmap.h

src/glut/glx/glutint.h

src/glut/glx/glutstroke.h

src/glut/glx/glutwin32.h

src/glut/glx/layerutil.c

src/glut/glx/layerutil.h

src/glut/glx/stroke.h

src/glut/glx/win32_glx.c

src/glut/glx/win32_glx.h

src/glut/glx/win32_menu.c

src/glut/glx/win32_util.c

src/glut/glx/win32_winproc.c

src/glut/glx/win32_x11.c

src/glut/glx/win32_x11.h

src/glut/mini

src/glut/mini/bitmap.c

src/glut/mini/callback.c

src/glut/mini/color.c

src/glut/mini/globals.c

src/glut/mini/glut.pc.in

src/glut/mini/init.c

src/glut/mini/internal.h

src/glut/mini/menu.c

src/glut/mini/models.c

src/glut/mini/overlay.c

src/glut/mini/state.c

src/glut/mini/teapot.c

src/glut/mini/window.c

src/mesa/drivers/dri/radeon/radeon_lighting.c

files modified:
ChangeLog

Makefile

aclocal.m4

configure

debian/changelog

debian/control

debian/rules

docs/news.html

docs/relnotes-7.7.1.html

src/gallium/auxiliary/util/u_debug.c

src/gallium/drivers/softpipe/sp_tile_cache.c

src/gallium/drivers/svga/svga_context.c

src/gallium/drivers/svga/svga_state_rss.c

src/gallium/drivers/svga/svga_winsys.h

src/gallium/state_trackers/dri/dri_screen.c

src/gallium/state_trackers/xorg/xorg_crtc.c

src/gallium/state_trackers/xorg/xorg_dri2.c

src/gallium/state_trackers/xorg/xorg_driver.c

src/gallium/state_trackers/xorg/xorg_exa.c

src/gallium/state_trackers/xorg/xorg_renderer.c

src/gallium/state_trackers/xorg/xorg_renderer.h

src/gallium/state_trackers/xorg/xorg_tracker.h

src/gallium/state_trackers/xorg/xorg_xv.c

src/gallium/winsys/drm/vmware/core/vmw_context.c

src/gallium/winsys/drm/vmware/core/vmw_context.h

src/gallium/winsys/drm/vmware/core/vmw_screen.c

src/gallium/winsys/drm/vmware/core/vmw_screen.h

src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c

src/gallium/winsys/drm/vmware/core/vmw_screen_ioctl.c

src/gallium/winsys/drm/vmware/xorg/vmw_screen.c

src/glx/x11/glx_pbuffer.c

src/glx/x11/indirect_vertex_array.c

src/mesa/drivers/dri/i915/intel_tris.c

src/mesa/drivers/dri/intel/intel_reg.h

src/mesa/drivers/dri/r200/r200_cmdbuf.c

src/mesa/drivers/dri/r200/r200_tcl.c

src/mesa/drivers/dri/r300/r300_state.c

src/mesa/drivers/dri/r600/r600_context.c

src/mesa/drivers/dri/r600/r600_texstate.c

src/mesa/drivers/dri/r600/r700_render.c

src/mesa/drivers/dri/r600/r700_state.c

src/mesa/drivers/dri/radeon/radeon_chipset.h

src/mesa/drivers/dri/radeon/radeon_screen.c

src/mesa/drivers/dri/swrast/swrast_span.c

src/mesa/drivers/dri/swrast/swrast_spantemp.h

src/mesa/main/extensions.c

src/mesa/main/hash.c

src/mesa/main/renderbuffer.c

src/mesa/main/texrender.c

src/mesa/main/version.h

src/mesa/state_tracker/st_cb_drawpixels.c

src/mesa/state_tracker/st_cb_fbo.c

src/mesa/state_tracker/st_cb_texture.c

src/mesa/state_tracker/st_framebuffer.c

src/mesa/state_tracker/st_public.h

src/mesa/vbo/vbo_split_copy.c

Show diffs side-by-side

added added

removed removed

src/gallium/state_trackers/xorg/xorg_dri2.c

295

295

GCPtr gc;

296

296

RegionPtr copy_clip;

297

297

Bool save_accel;

298

CustomizerPtr cust = ms->cust;

298

299

299

300

/*

300

301

* In driCreateBuffers we dewrap windows into the

348

349

ValidateGC(dst_draw, gc);

349

350

350

351

/* If this is a full buffer swap, throttle on the previous one */

351

if (dst_priv->fence && REGION_NUM_RECTS(pRegion) == 1) {

352

if (ms->swapThrottling &&

353

dst_priv->fence && REGION_NUM_RECTS(pRegion) == 1) {

352

354

BoxPtr extents = REGION_EXTENTS(pScreen, pRegion);

353

355

354

356

if (extents->x1 == 0 && extents->y1 == 0 &&

370

372

DamageRegionAppend(src_draw, pRegion);

371

373

DamageRegionProcessPending(src_draw);

372

374

375

if (cust && cust->winsys_context_throttle)

376

cust->winsys_context_throttle(cust, ms->ctx, THROTTLE_SWAP);

377

373

378

(*gc->ops->CopyArea)(src_draw, dst_draw, gc,

374

379

0, 0, pDraw->width, pDraw->height, 0, 0);

375

380

ms->exa->accel = save_accel;

377

382

FreeScratchGC(gc);

378

383

379

384

ms->ctx->flush(ms->ctx, PIPE_FLUSH_SWAPBUFFERS,

380

pDestBuffer->attachment == DRI2BufferFrontLeft ?

385

(pDestBuffer->attachment == DRI2BufferFrontLeft

386

&& ms->swapThrottling) ?

381

387

&dst_priv->fence : NULL);

388

389

if (cust && cust->winsys_context_throttle)

390

cust->winsys_context_throttle(cust, ms->ctx, THROTTLE_RENDER);

391

382

392

}

383

393

384

394

Bool

Older »