← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/xserver-xorg-video-intel/oneiric

~ubuntu-branches/ubuntu/oneiric/xserver-xorg-video-intel/oneiric

« back to all changes in this revision

Viewing changes to src/intel_batchbuffer.h

Committer: Bazaar Package Importer
Author(s): Christopher James Halse Rogers, Robert Hooker, Christopher James Halse Rogers
Date: 2011-08-09 10:10:02 UTC
mfrom: (0.1.21 experimental)
Revision ID: james.westby@ubuntu.com-20110809101002-pguc3kc6pzh1cp5h

Tags: 2:2.15.901-1ubuntu1

[ Robert Hooker ]
* Merge from debian-experimental, remaining changes:
  - 101_copy-fb.patch
    + Plymouth integration patch
  - 120_check_privates.patch
    + Check for null privates pointer on render_dest_picture.
  - debian/xserver-xorg-video-intel.preinst.in:
  - debian/xserver-xorg-video-intel.postinst.in:
    + Remove obsolete /etc/modprobe.d/i915-kms.conf file on upgrades.
      KMS is the kernel default.
* Dropped patches:
  - 121_fdo-28798-fix.patch (upstream)

[ Christopher James Halse Rogers ]
* Refresh 101_copy-fb.patch.

files added:
src/i965_3d.c

src/render_program/exa_wm_affine.g6i

src/render_program/exa_wm_mask_affine.g7a

src/render_program/exa_wm_mask_affine.g7b

src/render_program/exa_wm_mask_projective.g7a

src/render_program/exa_wm_mask_projective.g7b

src/render_program/exa_wm_mask_sample_a.g7a

src/render_program/exa_wm_mask_sample_a.g7b

src/render_program/exa_wm_mask_sample_argb.g7a

src/render_program/exa_wm_mask_sample_argb.g7b

src/render_program/exa_wm_sample_planar.g4i

src/render_program/exa_wm_src_affine.g7a

src/render_program/exa_wm_src_affine.g7b

src/render_program/exa_wm_src_projective.g7a

src/render_program/exa_wm_src_projective.g7b

src/render_program/exa_wm_src_sample_a.g7a

src/render_program/exa_wm_src_sample_a.g7b

src/render_program/exa_wm_src_sample_argb.g4i

src/render_program/exa_wm_src_sample_argb.g7a

src/render_program/exa_wm_src_sample_argb.g7b

src/render_program/exa_wm_src_sample_planar.g7a

src/render_program/exa_wm_src_sample_planar.g7b

src/render_program/exa_wm_write.g6i

src/render_program/exa_wm_write.g7a

src/render_program/exa_wm_write.g7b

src/render_program/exa_wm_yuv_rgb.g7a

src/render_program/exa_wm_yuv_rgb.g7b

src/sna

src/sna/Makefile.am

src/sna/Makefile.in

src/sna/README

src/sna/blt.c

src/sna/gen2_render.c

src/sna/gen2_render.h

src/sna/gen3_render.c

src/sna/gen3_render.h

src/sna/gen4_render.c

src/sna/gen4_render.h

src/sna/gen5_render.c

src/sna/gen5_render.h

src/sna/gen6_render.c

src/sna/gen6_render.h

src/sna/gen7_render.c

src/sna/gen7_render.h

src/sna/kgem.c

src/sna/kgem.h

src/sna/kgem_debug.c

src/sna/kgem_debug.h

src/sna/kgem_debug_gen2.c

src/sna/kgem_debug_gen3.c

src/sna/kgem_debug_gen4.c

src/sna/kgem_debug_gen5.c

src/sna/kgem_debug_gen6.c

src/sna/sna.h

src/sna/sna_accel.c

src/sna/sna_blt.c

src/sna/sna_composite.c

src/sna/sna_damage.c

src/sna/sna_damage.h

src/sna/sna_display.c

src/sna/sna_dri.c

src/sna/sna_driver.c

src/sna/sna_glyphs.c

src/sna/sna_gradient.c

src/sna/sna_io.c

src/sna/sna_module.h

src/sna/sna_reg.h

src/sna/sna_render.c

src/sna/sna_render.h

src/sna/sna_render_inline.h

src/sna/sna_stream.c

src/sna/sna_tiling.c

src/sna/sna_transform.c

src/sna/sna_trapezoids.c

src/sna/sna_video.c

src/sna/sna_video.h

src/sna/sna_video_hwmc.c

src/sna/sna_video_hwmc.h

src/sna/sna_video_overlay.c

src/sna/sna_video_textured.c

test

test/Makefile.am

test/Makefile.in

test/README

test/basic-copyarea-size.c

test/basic-copyarea.c

test/basic-fillrect.c

test/basic-putimage.c

test/basic-stress.c

test/mixed-stress.c

test/render-composite-solid.c

test/render-copyarea-size.c

test/render-copyarea.c

test/render-fill-copy.c

test/render-fill.c

test/render-trapezoid-image.c

test/render-trapezoid.c

test/test.h

test/test_display.c

test/test_image.c

test/test_log.c

test/test_render.c

files removed:
debian/patches/121_fdo-28798-fix.patch

files modified:
ChangeLog

Makefile.am

Makefile.in

NEWS

aclocal.m4

build-aux/config.guess

build-aux/config.sub

build-aux/ltmain.sh

config.h.in

configure

configure.ac

debian/changelog

debian/control

debian/patches/101_copy-fb.patch

debian/patches/series

debian/rules

debian/xserver-xorg-video-intel.install

m4/libtool.m4

m4/ltoptions.m4

m4/ltversion.m4

m4/lt~obsolete.m4

man/Makefile.in

man/intel.man

src/Makefile.am

src/Makefile.in

src/brw_structs.h

src/i965_reg.h

src/i965_render.c

src/i965_video.c

src/intel.h

src/intel_batchbuffer.c

src/intel_batchbuffer.h

src/intel_display.c

src/intel_dri.c

src/intel_driver.c

src/intel_driver.h

src/intel_module.c

src/intel_video.c

src/legacy/Makefile.in

src/legacy/i810/Makefile.in

src/legacy/i810/i810_dri.c

src/legacy/i810/xvmc/Makefile.in

src/render_program/Makefile.am

src/render_program/Makefile.in

src/render_program/exa_wm_mask_affine.g6a

src/render_program/exa_wm_src_affine.g6a

src/render_program/exa_wm_src_sample_argb.g4a

src/render_program/exa_wm_src_sample_argb.g6a

src/render_program/exa_wm_src_sample_planar.g4a

src/render_program/exa_wm_src_sample_planar.g6a

src/render_program/exa_wm_write.g6a

src/xvmc/Makefile.in

src/xvmc/shader/Makefile.in

src/xvmc/shader/mc/Makefile.in

src/xvmc/shader/vld/Makefile.in

uxa/Makefile.in

uxa/uxa-accel.c

uxa/uxa-glyphs.c

Show diffs side-by-side

added added

removed removed

src/intel_batchbuffer.h

137

137

138

138

priv->batch_write |= write_domain != 0;

139

139

priv->busy = 1;

140

141

intel->needs_flush |= write_domain != 0;

140

142

}

141

143

142

144

static inline void

Older »