<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Apr 16, 2018 at 8:37 AM, Matt Turner <span dir="ltr"><<a href="mailto:mattst88@gmail.com" target="_blank">mattst88@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Fixes a compilation error without Glamor.<br>
<br>
Bugzilla: <a href="https://bugs.gentoo.org/653288" rel="noreferrer" target="_blank">https://bugs.gentoo.org/653288</a><br>
Signed-off-by: Matt Turner <<a href="mailto:mattst88@gmail.com">mattst88@gmail.com</a>><br>
---<br>
Unfortunately, there's more: Xwayland fails to link without Glamor.<br>
<br>
hw/xfree86/drivers/<wbr>modesetting/drmmode_display.c | 14 +++++++-------<br>
1 file changed, 7 insertions(+), 7 deletions(-)<br>
<br>
diff --git a/hw/xfree86/drivers/<wbr>modesetting/drmmode_display.c b/hw/xfree86/drivers/<wbr>modesetting/drmmode_display.c<br>
index 322ef050b..79e91f0f8 100644<br>
--- a/hw/xfree86/drivers/<wbr>modesetting/drmmode_display.c<br>
+++ b/hw/xfree86/drivers/<wbr>modesetting/drmmode_display.c<br>
@@ -998,18 +998,18 @@ static Bool<br>
drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo,<br>
unsigned width, unsigned height, unsigned bpp)<br>
{<br>
- uint32_t format;<br>
-<br>
- if (drmmode->scrn->depth == 30)<br>
- format = GBM_FORMAT_ARGB2101010;<br>
- else<br>
- format = GBM_FORMAT_ARGB8888;<br>
-<br>
bo->width = width;<br>
bo->height = height;<br>
<br>
#ifdef GLAMOR_HAS_GBM<br>
if (drmmode->glamor) {<br>
+ uint32_t format;<br>
+<br>
+ if (drmmode->scrn->depth == 30)<br>
+ format = GBM_FORMAT_ARGB2101010;<br>
+ else<br>
+ format = GBM_FORMAT_ARGB8888;<br>
+<br>
#ifdef GBM_BO_WITH_MODIFIERS<br>
uint32_t num_modifiers;<br>
uint64_t *modifiers = NULL;<br>
<span class="HOEnZb"><font color="#888888">-- <br>
2.16.1</font></span><br></blockquote></div><br></div><div class="gmail_extra"><br>Reviewed-by: Olivier Fourdan <<a href="mailto:ofourdan@redhat.com">ofourdan@redhat.com</a>><br><br></div><div class="gmail_extra">Cheers,<br></div><div class="gmail_extra">Olivier<br></div></div>