1*4882a593SmuzhiyunFrom a78e31b5fffadd73b00483f21e54bd144f1b439a Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com> 3*4882a593SmuzhiyunDate: Fri, 26 Mar 2021 17:42:10 +0100 4*4882a593SmuzhiyunSubject: [PATCH] Guard local variable priv only used with glamor 5*4882a593SmuzhiyunMIME-Version: 1.0 6*4882a593SmuzhiyunContent-Type: text/plain; charset=UTF-8 7*4882a593SmuzhiyunContent-Transfer-Encoding: 8bit 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunFixes compile errors with glamor disabled: 10*4882a593Smuzhiyun 11*4882a593Smuzhiyun../../src/radeon_present.c: In function ‘radeon_present_check_flip’: 12*4882a593Smuzhiyun../../src/radeon_present.c:281:21: error: invalid use of undefined type ‘struct radeon_pixmap’ 13*4882a593Smuzhiyun 281 | if (priv && priv->fb_failed) 14*4882a593Smuzhiyun | ^~ 15*4882a593Smuzhiyun../../src/radeon_present.c:288:19: error: invalid use of undefined type ‘struct radeon_pixmap’ 16*4882a593Smuzhiyun 288 | if (priv && !priv->fb_failed) { 17*4882a593Smuzhiyun | ^~ 18*4882a593Smuzhiyun../../src/radeon_present.c:292:10: error: invalid use of undefined type ‘struct radeon_pixmap’ 19*4882a593Smuzhiyun 292 | priv->fb_failed = TRUE; 20*4882a593Smuzhiyun | ^~ 21*4882a593Smuzhiyun 22*4882a593Smuzhiyun(cherry picked from commit 3c7c84ed49564907a148ae99b03200e0be350060) 23*4882a593SmuzhiyunSigned-off-by: Romain Naour <romain.naour@gmail.com> 24*4882a593Smuzhiyun--- 25*4882a593Smuzhiyun src/radeon_present.c | 6 ++++++ 26*4882a593Smuzhiyun 1 file changed, 6 insertions(+) 27*4882a593Smuzhiyun 28*4882a593Smuzhiyundiff --git a/src/radeon_present.c b/src/radeon_present.c 29*4882a593Smuzhiyunindex 494655c9..d010aa19 100644 30*4882a593Smuzhiyun--- a/src/radeon_present.c 31*4882a593Smuzhiyun+++ b/src/radeon_present.c 32*4882a593Smuzhiyun@@ -254,7 +254,9 @@ radeon_present_check_flip(RRCrtcPtr crtc, WindowPtr window, PixmapPtr pixmap, 33*4882a593Smuzhiyun xf86CrtcPtr xf86_crtc = crtc->devPrivate; 34*4882a593Smuzhiyun ScreenPtr screen = window->drawable.pScreen; 35*4882a593Smuzhiyun ScrnInfoPtr scrn = xf86_crtc->scrn; 36*4882a593Smuzhiyun+#ifdef USE_GLAMOR 37*4882a593Smuzhiyun struct radeon_pixmap *priv = radeon_get_pixmap_private(pixmap); 38*4882a593Smuzhiyun+#endif 39*4882a593Smuzhiyun xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); 40*4882a593Smuzhiyun RADEONInfoPtr info = RADEONPTR(scrn); 41*4882a593Smuzhiyun PixmapPtr screen_pixmap = screen->GetScreenPixmap(screen); 42*4882a593Smuzhiyun@@ -278,10 +280,13 @@ radeon_present_check_flip(RRCrtcPtr crtc, WindowPtr window, PixmapPtr pixmap, 43*4882a593Smuzhiyun return FALSE; 44*4882a593Smuzhiyun #endif 45*4882a593Smuzhiyun 46*4882a593Smuzhiyun+#ifdef USE_GLAMOR 47*4882a593Smuzhiyun if (priv && priv->fb_failed) 48*4882a593Smuzhiyun return FALSE; 49*4882a593Smuzhiyun+#endif 50*4882a593Smuzhiyun 51*4882a593Smuzhiyun if (!radeon_pixmap_get_fb(pixmap)) { 52*4882a593Smuzhiyun+#ifdef USE_GLAMOR 53*4882a593Smuzhiyun if (!priv) 54*4882a593Smuzhiyun priv = radeon_get_pixmap_private(pixmap); 55*4882a593Smuzhiyun 56*4882a593Smuzhiyun@@ -291,6 +296,7 @@ radeon_present_check_flip(RRCrtcPtr crtc, WindowPtr window, PixmapPtr pixmap, 57*4882a593Smuzhiyun "normal if using PRIME render offloading)\n"); 58*4882a593Smuzhiyun priv->fb_failed = TRUE; 59*4882a593Smuzhiyun } 60*4882a593Smuzhiyun+#endif 61*4882a593Smuzhiyun 62*4882a593Smuzhiyun return FALSE; 63*4882a593Smuzhiyun } 64*4882a593Smuzhiyun-- 65*4882a593Smuzhiyun2.31.1 66*4882a593Smuzhiyun 67