← Back to branch summary

~ubuntu-branches/ubuntu/karmic/xserver-xorg-video-intel/karmic-proposed

~ubuntu-branches/ubuntu/karmic/xserver-xorg-video-intel/karmic-proposed

« back to all changes in this revision

Viewing changes to src/i830_cursor.c

Committer: Bazaar Package Importer
Author(s): Brice Goglin
Date: 2009-09-23 01:03:49 UTC
mfrom: (1.3.4 upstream) (1.2.9 sid)
mto: (1.5.3 squeeze)
mto: This revision was merged to the branch mainline in revision 102.
Revision ID: james.westby@ubuntu.com-20090923010349-dyyejg48nm80lh8u

Tags: 2:2.8.99.902-1

http://bugs.debian.org/543326

* New upstream release candidate.
+ Fix crash on server regen, closes: #543326.

files added:
src/reg_dumper/audio.c

src/xvmc/shader/mc/dual_prime.g4b.gen5

src/xvmc/shader/mc/dual_prime_igd.g4b.gen5

src/xvmc/shader/mc/field_backward.g4b.gen5

src/xvmc/shader/mc/field_backward_igd.g4b.gen5

src/xvmc/shader/mc/field_f_b.g4b.gen5

src/xvmc/shader/mc/field_f_b_igd.g4b.gen5

src/xvmc/shader/mc/field_forward.g4b.gen5

src/xvmc/shader/mc/field_forward_igd.g4b.gen5

src/xvmc/shader/mc/frame_backward.g4b.gen5

src/xvmc/shader/mc/frame_backward_igd.g4b.gen5

src/xvmc/shader/mc/frame_f_b.g4b.gen5

src/xvmc/shader/mc/frame_f_b_igd.g4b.gen5

src/xvmc/shader/mc/frame_forward.g4b.gen5

src/xvmc/shader/mc/frame_forward_igd.g4b.gen5

src/xvmc/shader/mc/ipicture.g4b.gen5

src/xvmc/shader/mc/ipicture_igd.g4b.gen5

src/xvmc/shader/mc/lib_igd.g4b.gen5

src/xvmc/shader/mc/null.g4b.gen5

src/xvmc/shader/vld/field_backward.g4b.gen5

src/xvmc/shader/vld/field_f_b.g4b.gen5

src/xvmc/shader/vld/field_forward.g4b.gen5

src/xvmc/shader/vld/frame_backward.g4b.gen5

src/xvmc/shader/vld/frame_f_b.g4b.gen5

src/xvmc/shader/vld/frame_forward.g4b.gen5

src/xvmc/shader/vld/ipicture.g4b.gen5

src/xvmc/shader/vld/lib.g4b.gen5

files removed:
mkinstalldirs

files modified:
ChangeLog

Makefile.in

NEWS

aclocal.m4

config.h.in

configure

configure.ac

debian/changelog

debian/control

debian/rules

debian/xsfbs/xsfbs.mk

debian/xsfbs/xsfbs.sh

man/Makefile.in

src/Makefile.in

src/bios_reader/Makefile.in

src/bios_reader/bios_reader.c

src/ch7017/Makefile.in

src/ch7017/ch7017.c

src/ch7xxx/Makefile.in

src/ch7xxx/ch7xxx.c

src/common.h

src/drmmode_display.c

src/i810_driver.c

src/i810_hwmc.c

src/i810_reg.h

src/i810_video.c

src/i830.h

src/i830_accel.c

src/i830_bios.c

src/i830_bios.h

src/i830_cursor.c

src/i830_debug.c

src/i830_display.c

src/i830_driver.c

src/i830_hwmc.c

src/i830_i2c.c

src/i830_lvds.c

src/i830_memory.c

src/i830_quirks.c

src/i830_reg.h

src/i830_render.c

src/i830_sdvo.c

src/i830_tv.c

src/i830_uxa.c

src/i830_video.c

src/i915_hwmc.c

src/i915_render.c

src/i915_video.c

src/i965_hwmc.c

src/i965_hwmc.h

src/i965_render.c

src/i965_video.c

src/ivch/Makefile.in

src/ivch/ivch.c

src/reg_dumper/Makefile.am

src/reg_dumper/Makefile.in

src/render_program/Makefile.in

src/render_program/exa_wm_src_sample_planar.g4a

src/render_program/exa_wm_src_sample_planar.g4b

src/render_program/exa_wm_src_sample_planar.g4b.gen5

src/sil164/Makefile.in

src/sil164/sil164.c

src/tfp410/Makefile.in

src/tfp410/tfp410.c

src/xvmc/Makefile.in

src/xvmc/i965_xvmc.c

src/xvmc/shader/Makefile.in

src/xvmc/shader/mc/Makefile.am

src/xvmc/shader/mc/Makefile.in

src/xvmc/shader/vld/Makefile.am

src/xvmc/shader/vld/Makefile.in

src/xvmc/xvmc_vld.c

uxa/Makefile.in

uxa/uxa-accel.c

uxa/uxa-priv.h

uxa/uxa-render.c

uxa/uxa.c

uxa/uxa.h

Show diffs side-by-side

added added

removed removed

src/i830_cursor.c

119

119

HARDWARE_CURSOR_SWAP_SOURCE_AND_MASK |

120

120

HARDWARE_CURSOR_AND_SOURCE_WITH_MASK |

121

121

HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64 |

122

HARDWARE_CURSOR_UPDATE_UNHIDDEN |

122

123

HARDWARE_CURSOR_ARGB));

123

124

}

124

125

Older »