diff options
| author | Chia-I Wu <[email protected]> | 2010-03-16 15:12:46 +0800 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2010-03-16 15:12:46 +0800 |
| commit | 9d3a873f425fde83628b547c4b4638f39d78c1b9 (patch) | |
| tree | 890dce800787f2a896554c96064eb51f0138950b /src/gallium/state_trackers/dri | |
| parent | 95d43bccde9ba5c0727bb2b9e52d050dacfa0cfa (diff) | |
| parent | a66d0081044bfcbfbe72ecbc27692387e4716e5c (diff) | |
Merge remote branch 'origin/gallium-st-api'
Diffstat (limited to 'src/gallium/state_trackers/dri')
| -rw-r--r-- | src/gallium/state_trackers/dri/dri_context.c | 1 | ||||
| -rw-r--r-- | src/gallium/state_trackers/dri/dri_drawable.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/gallium/state_trackers/dri/dri_context.c b/src/gallium/state_trackers/dri/dri_context.c index 9811f8cf43c..f772ba5d16b 100644 --- a/src/gallium/state_trackers/dri/dri_context.c +++ b/src/gallium/state_trackers/dri/dri_context.c @@ -35,7 +35,6 @@ #include "state_tracker/drm_api.h" #include "state_tracker/dri1_api.h" #include "state_tracker/st_public.h" -#include "state_tracker/st_context.h" #include "pipe/p_context.h" #include "dri_context.h" diff --git a/src/gallium/state_trackers/dri/dri_drawable.c b/src/gallium/state_trackers/dri/dri_drawable.c index 458473853cf..c400725c7f2 100644 --- a/src/gallium/state_trackers/dri/dri_drawable.c +++ b/src/gallium/state_trackers/dri/dri_drawable.c @@ -39,8 +39,8 @@ #include "main/renderbuffer.h" #include "state_tracker/drm_api.h" #include "state_tracker/dri1_api.h" -#include "state_tracker/st_public.h" #include "state_tracker/st_context.h" +#include "state_tracker/st_public.h" #include "state_tracker/st_cb_fbo.h" #include "util/u_format.h" |