frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Kenneth Graunke 2014-12-11 13:48:04 -08:00 committed by Keith Packard
parent 7d1fc04d27
commit 3b5be33fc5
4 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/drivers/modesetting/dri2.c
View File

@ -43,8 +43,6 @@
#include "dri2.h" #include "dri2.h"
#ifdef GLAMOR #ifdef GLAMOR
#define GLAMOR_FOR_XORG 1
#include "glamor.h"
enum ms_dri2_frame_event_type { enum ms_dri2_frame_event_type {
MS_DRI2_QUEUE_SWAP, MS_DRI2_QUEUE_SWAP,

5
hw/xfree86/drivers/modesetting/driver.c
View File

@ -61,11 +61,6 @@
#include "driver.h" #include "driver.h"
#ifdef GLAMOR
#define GLAMOR_FOR_XORG 1
#include "glamor.h"
#endif
static void AdjustFrame(ScrnInfoPtr pScrn, int x, int y); static void AdjustFrame(ScrnInfoPtr pScrn, int x, int y);
static Bool CloseScreen(ScreenPtr pScreen); static Bool CloseScreen(ScreenPtr pScreen);
static Bool EnterVT(ScrnInfoPtr pScrn); static Bool EnterVT(ScrnInfoPtr pScrn);

8
hw/xfree86/drivers/modesetting/driver.h
View File

@ -33,6 +33,14 @@
#include <xf86Crtc.h> #include <xf86Crtc.h>
#include <damage.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" #include "drmmode_display.h"
#define DRV_ERROR(msg) xf86DrvMsg(pScrn->scrnIndex, X_ERROR, msg); #define DRV_ERROR(msg) xf86DrvMsg(pScrn->scrnIndex, X_ERROR, msg);

8
hw/xfree86/drivers/modesetting/drmmode_display.c
View File

@ -50,14 +50,6 @@
#include "driver.h" #include "driver.h"
#ifdef GLAMOR
#define GLAMOR_FOR_XORG 1
#include "glamor.h"
#ifdef GLAMOR_HAS_GBM
#include <gbm.h>
#endif
#endif
static int static int
drmmode_bo_destroy(drmmode_ptr drmmode, drmmode_bo *bo) drmmode_bo_destroy(drmmode_ptr drmmode, drmmode_bo *bo)
{ {