diff options
| author | Brian Paul <[email protected]> | 2009-12-27 15:31:08 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-12-27 15:31:08 -0700 |
| commit | d0b7ff551ab25153e3023871af3daa65b394a828 (patch) | |
| tree | cfff232421273b15820b4ab6773219ba676e52d5 /src/mesa/drivers/dri/intel | |
| parent | 7831515e69ac875b1ac0b1b248ab10c6cf37bf52 (diff) | |
| parent | da876fa3a5df77763fe106b5e0a17b2e672a506c (diff) | |
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts:
src/gallium/auxiliary/util/u_network.c
src/gallium/auxiliary/util/u_network.h
src/gallium/drivers/i915/i915_state.c
src/gallium/drivers/trace/tr_rbug.c
src/gallium/state_trackers/vega/bezier.c
src/gallium/state_trackers/vega/vg_context.c
src/gallium/state_trackers/xorg/xorg_crtc.c
src/gallium/state_trackers/xorg/xorg_driver.c
src/gallium/winsys/xlib/xlib_brw_context.c
src/mesa/main/mtypes.h
Diffstat (limited to 'src/mesa/drivers/dri/intel')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_pixel_bitmap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c index 204a2331737..9545ef4b49d 100644 --- a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c +++ b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c @@ -32,6 +32,7 @@ #include "main/mtypes.h" #include "main/macros.h" #include "main/bufferobj.h" +#include "main/polygon.h" #include "main/pixelstore.h" #include "main/polygon.h" #include "main/state.h" |