diff options
Diffstat (limited to 'src/gallium/state_trackers')
-rw-r--r-- | src/gallium/state_trackers/dri/dri1.c | 1 | ||||
-rw-r--r-- | src/gallium/state_trackers/dri/dri1.h | 3 | ||||
-rw-r--r-- | src/gallium/state_trackers/dri/dri_context.c | 8 | ||||
-rw-r--r-- | src/gallium/state_trackers/dri/dri_drawable.c | 7 | ||||
-rw-r--r-- | src/gallium/state_trackers/dri/dri_screen.c | 3 |
5 files changed, 8 insertions, 14 deletions
diff --git a/src/gallium/state_trackers/dri/dri1.c b/src/gallium/state_trackers/dri/dri1.c index a4284f6fe7..543891f813 100644 --- a/src/gallium/state_trackers/dri/dri1.c +++ b/src/gallium/state_trackers/dri/dri1.c @@ -34,6 +34,7 @@ #include "pipe/p_context.h" #include "state_tracker/st_context.h" #include "state_tracker/st_public.h" +#include "state_tracker/dri1_api.h" #include "dri_screen.h" #include "dri_context.h" diff --git a/src/gallium/state_trackers/dri/dri1.h b/src/gallium/state_trackers/dri/dri1.h index b2304af7e1..e525ce64c3 100644 --- a/src/gallium/state_trackers/dri/dri1.h +++ b/src/gallium/state_trackers/dri/dri1.h @@ -32,7 +32,8 @@ #ifndef DRI1_H #define DRI1_H -#include "state_tracker/dri1_api.h" +#include "dri_context.h" +#include "dri_drawable.h" #include "dri_util.h" extern struct dri1_api *__dri1_api_hooks; diff --git a/src/gallium/state_trackers/dri/dri_context.c b/src/gallium/state_trackers/dri/dri_context.c index 58f2b17585..8e74d3b9bf 100644 --- a/src/gallium/state_trackers/dri/dri_context.c +++ b/src/gallium/state_trackers/dri/dri_context.c @@ -30,16 +30,12 @@ */ #include "dri_screen.h" - #include "dri_drawable.h" -#include "state_tracker/drm_api.h" -#include "state_tracker/dri1_api.h" -#include "state_tracker/st_public.h" -#include "pipe/p_context.h" - #include "dri_context.h" #include "dri1.h" +#include "state_tracker/st_public.h" +#include "pipe/p_context.h" #include "util/u_memory.h" GLboolean diff --git a/src/gallium/state_trackers/dri/dri_drawable.c b/src/gallium/state_trackers/dri/dri_drawable.c index 6c4de71c89..9238f94299 100644 --- a/src/gallium/state_trackers/dri/dri_drawable.c +++ b/src/gallium/state_trackers/dri/dri_drawable.c @@ -34,19 +34,16 @@ #include "dri_drawable.h" #include "dri1.h" -#include "pipe/p_context.h" -#include "pipe/p_screen.h" #include "main/mtypes.h" #include "main/renderbuffer.h" -#include "state_tracker/drm_api.h" -#include "state_tracker/dri1_api.h" #include "state_tracker/st_context.h" #include "state_tracker/st_public.h" #include "state_tracker/st_cb_fbo.h" +#include "state_tracker/drm_api.h" +#include "pipe/p_screen.h" #include "util/u_format.h" #include "util/u_memory.h" -#include "util/u_rect.h" #include "util/u_inlines.h" static struct pipe_surface * diff --git a/src/gallium/state_trackers/dri/dri_screen.c b/src/gallium/state_trackers/dri/dri_screen.c index b6cd92d0f8..cffe3b33b2 100644 --- a/src/gallium/state_trackers/dri/dri_screen.c +++ b/src/gallium/state_trackers/dri/dri_screen.c @@ -41,7 +41,6 @@ #include "pipe/p_screen.h" #include "pipe/p_format.h" #include "state_tracker/drm_api.h" -#include "state_tracker/dri1_api.h" #include "util/u_debug.h" @@ -304,7 +303,7 @@ dri_destroy_screen(__DRIscreen * sPriv) sPriv->private = NULL; } -PUBLIC const struct __DriverAPIRec driDriverAPI = { +const struct __DriverAPIRec driDriverAPI = { .DestroyScreen = dri_destroy_screen, .CreateContext = dri_create_context, .DestroyContext = dri_destroy_context, |