diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2014-12-11 13:48:04 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-12-25 13:39:17 -0800 |
| commit | 3b5be33fc55b3090d996014fa56603edb9c1d411 (patch) | |
| tree | 34748e188e530ffc2ae53c34e446b530d9c8d924 | |
| parent | 7d1fc04d27857c999bd732d54a0b36f5079449b8 (diff) | |
modesetting: Include glamor.h from driver.h.
We basically want it throughout the driver.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Jason Ekstrand <jason.ekstrand@intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | hw/xfree86/drivers/modesetting/dri2.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/drivers/modesetting/driver.c | 5 | ||||
| -rw-r--r-- | hw/xfree86/drivers/modesetting/driver.h | 8 | ||||
| -rw-r--r-- | hw/xfree86/drivers/modesetting/drmmode_display.c | 8 |
4 files changed, 8 insertions, 15 deletions
diff --git a/hw/xfree86/drivers/modesetting/dri2.c b/hw/xfree86/drivers/modesetting/dri2.c index 6c88060b0..63cb0659d 100644 --- a/hw/xfree86/drivers/modesetting/dri2.c +++ b/hw/xfree86/drivers/modesetting/dri2.c @@ -43,8 +43,6 @@ #include "dri2.h" #ifdef GLAMOR -#define GLAMOR_FOR_XORG 1 -#include "glamor.h" enum ms_dri2_frame_event_type { MS_DRI2_QUEUE_SWAP, diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c index be025bd07..26054f2ab 100644 --- a/hw/xfree86/drivers/modesetting/driver.c +++ b/hw/xfree86/drivers/modesetting/driver.c @@ -61,11 +61,6 @@ #include "driver.h" -#ifdef GLAMOR -#define GLAMOR_FOR_XORG 1 -#include "glamor.h" -#endif - static void AdjustFrame(ScrnInfoPtr pScrn, int x, int y); static Bool CloseScreen(ScreenPtr pScreen); static Bool EnterVT(ScrnInfoPtr pScrn); diff --git a/hw/xfree86/drivers/modesetting/driver.h b/hw/xfree86/drivers/modesetting/driver.h index bbf1ae029..4267fa1d8 100644 --- a/hw/xfree86/drivers/modesetting/driver.h +++ b/hw/xfree86/drivers/modesetting/driver.h @@ -33,6 +33,14 @@ #include <xf86Crtc.h> #include <damage.h> +#ifdef GLAMOR +#define GLAMOR_FOR_XORG 1 +#include "glamor.h" +#ifdef GLAMOR_HAS_GBM +#include <gbm.h> +#endif +#endif + #include "drmmode_display.h" #define DRV_ERROR(msg) xf86DrvMsg(pScrn->scrnIndex, X_ERROR, msg); diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c index fd5cf2b28..824500bae 100644 --- a/hw/xfree86/drivers/modesetting/drmmode_display.c +++ b/hw/xfree86/drivers/modesetting/drmmode_display.c @@ -50,14 +50,6 @@ #include "driver.h" -#ifdef GLAMOR -#define GLAMOR_FOR_XORG 1 -#include "glamor.h" -#ifdef GLAMOR_HAS_GBM -#include <gbm.h> -#endif -#endif - static int drmmode_bo_destroy(drmmode_ptr drmmode, drmmode_bo *bo) { |