diff options
| author | marha <marha@users.sourceforge.net> | 2014-10-12 21:11:32 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-10-12 21:38:35 +0200 |
| commit | 1a83b8e49a75e2dab63805de25e384e0e38c27ed (patch) | |
| tree | 5280fe2a1bd2ce227e4bce9ce06134986e181de1 /xorg-server/hw/xfree86/drivers/modesetting/driver.h | |
| parent | 4aea4b223604c589828beb1145875a5fbcc41eed (diff) | |
| parent | 9480392b8817f8bfa79cbc694ff039a73fc0a57f (diff) | |
| download | vcxsrv-1a83b8e49a75e2dab63805de25e384e0e38c27ed.tar.gz vcxsrv-1a83b8e49a75e2dab63805de25e384e0e38c27ed.tar.bz2 vcxsrv-1a83b8e49a75e2dab63805de25e384e0e38c27ed.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/glsl/glsl_symbol_table.h
mesalib/src/mesa/drivers/common/meta_blit.c
xorg-server/dix/dispatch.c
xorg-server/glx/indirect_dispatch.c
xorg-server/glx/indirect_dispatch_swap.c
xorg-server/mi/miexpose.c
Diffstat (limited to 'xorg-server/hw/xfree86/drivers/modesetting/driver.h')
| -rw-r--r-- | xorg-server/hw/xfree86/drivers/modesetting/driver.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xorg-server/hw/xfree86/drivers/modesetting/driver.h b/xorg-server/hw/xfree86/drivers/modesetting/driver.h index 450b29c2b..35f24193a 100644 --- a/xorg-server/hw/xfree86/drivers/modesetting/driver.h +++ b/xorg-server/hw/xfree86/drivers/modesetting/driver.h @@ -35,16 +35,14 @@ #include "drmmode_display.h" #define DRV_ERROR(msg) xf86DrvMsg(pScrn->scrnIndex, X_ERROR, msg); -typedef struct -{ +typedef struct { int lastInstance; int refCount; ScrnInfoPtr pScrn_1; ScrnInfoPtr pScrn_2; } EntRec, *EntPtr; -typedef struct _modesettingRec -{ +typedef struct _modesettingRec { int fd; EntPtr entityPrivate; @@ -76,6 +74,7 @@ typedef struct _modesettingRec Bool dirty_enabled; uint32_t cursor_width, cursor_height; + Bool glamor; } modesettingRec, *modesettingPtr; #define modesettingPTR(p) ((modesettingPtr)((p)->driverPrivate)) |