Commit 3b5be33f authored by Kenneth Graunke's avatar Kenneth Graunke Committed by Keith Packard

modesetting: Include glamor.h from driver.h.

We basically want it throughout the driver.
Signed-off-by: Kenneth Graunke's avatarKenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Keith Packard's avatarKeith Packard <keithp@keithp.com>
Tested-by: Jason Ekstrand's avatarJason Ekstrand <jason.ekstrand@intel.com>
Signed-off-by: Keith Packard's avatarKeith Packard <keithp@keithp.com>
parent 7d1fc04d
......@@ -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,
......
......@@ -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);
......
......@@ -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);
......
......@@ -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)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment