← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/intel.h

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen
  • Date: 2012-09-29 16:45:35 UTC
  • mfrom: (1.4.24)
  • Revision ID: package-import@ubuntu.com-20120929164535-g15mwstkty0de7ki
Tags: 2:2.20.9-0ubuntu1
https://launchpad.net/bugs/966744
* Merge from unrelease debian git.
  - fixes racy UXA pageflip code (LP: #966744)
* Drop dont-run-intel-mode-fini-before-preinit.diff, upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/intel.h
68
68
#include "i915_drm.h"
69
69
 
70
70
#include "intel_driver.h"
 
71
#include "intel_options.h"
71
72
#include "intel_list.h"
72
73
#include "compat-api.h"
73
74
 
142
143
 
143
144
#include "common.h"
144
145
 
145
 
#ifdef XvMCExtension
146
 
#ifdef ENABLE_XVMC
147
 
#define INTEL_XVMC 1
148
 
#endif
149
 
#endif
150
 
 
151
146
#define PITCH_NONE 0
152
147
 
153
148
/** enumeration of 3d consumers so some can maintain invariant state. */