diff options
| author | Jakob Bornecrantz <jakob@vmware.com> | 2010-06-28 20:59:09 +0200 |
|---|---|---|
| committer | Jakob Bornecrantz <jakob@vmware.com> | 2010-06-28 21:14:45 +0200 |
| commit | a01e0afd9fc0d647081c6903baa1a7ba505c4b05 (patch) | |
| tree | 7e04eb2b4e87137455920f6131b064dc87056e14 /src/gallium/state_trackers/dri/common | |
| parent | 250b92f3bb4fc4a53f3150b0e8ff1e121a5adbc7 (diff) | |
| parent | 9ca563a9a8573bf79821abc75ccf0fdade19c8a9 (diff) | |
Merge branch 'gallium-drm-driver-drescriptor'
Conflicts:
src/gallium/state_trackers/egl/x11/native_dri2.c
src/gallium/state_trackers/egl/x11/native_x11.c
src/gallium/state_trackers/egl/x11/native_x11.h
src/gallium/state_trackers/xorg/xorg_driver.c
src/gallium/winsys/radeon/drm/radeon_drm.c
Diffstat (limited to 'src/gallium/state_trackers/dri/common')
| -rw-r--r-- | src/gallium/state_trackers/dri/common/dri_screen.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gallium/state_trackers/dri/common/dri_screen.h b/src/gallium/state_trackers/dri/common/dri_screen.h index 9ff925d4be..087ae8d2a4 100644 --- a/src/gallium/state_trackers/dri/common/dri_screen.h +++ b/src/gallium/state_trackers/dri/common/dri_screen.h @@ -39,7 +39,6 @@ #include "pipe/p_context.h" #include "pipe/p_state.h" #include "state_tracker/st_api.h" -#include "state_tracker/drm_api.h" struct dri_context; struct dri_drawable; @@ -75,7 +74,6 @@ struct dri_screen enum st_attachment_type statt); /* gallium */ - struct drm_api *api; boolean d_depth_bits_last; boolean sd_depth_bits_last; boolean auto_fake_front; |