git.tremily.us Git - gentoo.git/blob

   1 From a98a95b798a0062783ae6fd2135ad488af5efcfd Mon Sep 17 00:00:00 2001
   2 From: Matt Turner <mattst88@gmail.com>
   3 Date: Sun, 15 Apr 2018 23:37:45 -0700
   4 Subject: [PATCH xserver 2/2] modesetting: Move GBM code inside #ifdef
   5  GLAMOR_HAS_GBM
   6
   7 Fixes a compilation error without Glamor.
   8
   9 Bugzilla: https://bugs.gentoo.org/653288
  10 Signed-off-by: Matt Turner <mattst88@gmail.com>
  11 Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
  12 ---
  13  hw/xfree86/drivers/modesetting/drmmode_display.c | 14 +++++++-------
  14  1 file changed, 7 insertions(+), 7 deletions(-)
  15
  16 diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
  17 index 322ef050b..79e91f0f8 100644
  18 --- a/hw/xfree86/drivers/modesetting/drmmode_display.c
  19 +++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
  20 @@ -998,18 +998,18 @@ static Bool
  21  drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo,
  22                    unsigned width, unsigned height, unsigned bpp)
  23  {
  24 -    uint32_t format;
  25 -
  26 -    if (drmmode->scrn->depth == 30)
  27 -        format = GBM_FORMAT_ARGB2101010;
  28 -    else
  29 -        format = GBM_FORMAT_ARGB8888;
  30 -
  31      bo->width = width;
  32      bo->height = height;
  33
  34  #ifdef GLAMOR_HAS_GBM
  35      if (drmmode->glamor) {
  36 +        uint32_t format;
  37 +
  38 +        if (drmmode->scrn->depth == 30)
  39 +            format = GBM_FORMAT_ARGB2101010;
  40 +        else
  41 +            format = GBM_FORMAT_ARGB8888;
  42 +
  43  #ifdef GBM_BO_WITH_MODIFIERS
  44          uint32_t num_modifiers;
  45          uint64_t *modifiers = NULL;
  46 --
  47 2.16.1
  48