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

modesetting: Move GBM code inside #ifdef GLAMOR_HAS_GBM 

Fixes a compilation error without Glamor.

Bugzilla: https://bugs.gentoo.org/653288
Signed-off-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
This commit is contained in:
Matt Turner 2018-04-15 23:37:45 -07:00 committed by Adam Jackson
parent c3ae963a7b
commit a98a95b798
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -998,6 +998,11 @@ static Bool
drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo, drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo,
unsigned width, unsigned height, unsigned bpp) unsigned width, unsigned height, unsigned bpp)
{ {
bo->width = width;
bo->height = height;
#ifdef GLAMOR_HAS_GBM
if (drmmode->glamor) {
uint32_t format; uint32_t format;
if (drmmode->scrn->depth == 30) if (drmmode->scrn->depth == 30)
@ -1005,11 +1010,6 @@ drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo,
else else
format = GBM_FORMAT_ARGB8888; format = GBM_FORMAT_ARGB8888;
bo->width = width;
bo->height = height;
#ifdef GLAMOR_HAS_GBM
if (drmmode->glamor) {
#ifdef GBM_BO_WITH_MODIFIERS #ifdef GBM_BO_WITH_MODIFIERS
uint32_t num_modifiers; uint32_t num_modifiers;
uint64_t *modifiers = NULL; uint64_t *modifiers = NULL;