[mutter] backend/native: Fix compiler warning w/out EGL device



commit 85f4772a4f8c64502f5da4176d7e14e496a9365f
Author: Olivier Fourdan <ofourdan redhat com>
Date:   Thu Jun 27 09:24:19 2019 +0200

    backend/native: Fix compiler warning w/out EGL device
    
    When building without EGL device support, the following compiler warning
    is seen:
    
    ```
      src/backends/native/meta-renderer-native.c:2637:20: warning: unused
      variable ‘cogl_renderer_egl’ [-Wunused-variable]
    ```
    
    Fix the warning by placing the relevant variable declarations within the
    `#ifdef HAVE_EGL_DEVICE/#endif` statement.
    
    https://gitlab.gnome.org/GNOME/mutter/merge_requests/656

 src/backends/native/meta-renderer-native.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/backends/native/meta-renderer-native.c b/src/backends/native/meta-renderer-native.c
index 5228310fc..51c716cfa 100644
--- a/src/backends/native/meta-renderer-native.c
+++ b/src/backends/native/meta-renderer-native.c
@@ -2633,8 +2633,6 @@ meta_renderer_native_release_onscreen (CoglOnscreen *onscreen)
   CoglContext *cogl_context = framebuffer->context;
   CoglDisplay *cogl_display = cogl_context_get_display (cogl_context);
   CoglDisplayEGL *cogl_display_egl = cogl_display->winsys;
-  CoglRenderer *cogl_renderer = cogl_context->display->renderer;
-  CoglRendererEGL *cogl_renderer_egl = cogl_renderer->winsys;
   CoglOnscreenEGL *onscreen_egl = onscreen->winsys;
   MetaOnscreenNative *onscreen_native;
   MetaRendererNative *renderer_native;
@@ -2688,6 +2686,8 @@ meta_renderer_native_release_onscreen (CoglOnscreen *onscreen)
       if (onscreen_native->egl.stream != EGL_NO_STREAM_KHR)
         {
           MetaEgl *egl = meta_onscreen_native_get_egl (onscreen_native);
+          CoglRenderer *cogl_renderer = cogl_context->display->renderer;
+          CoglRendererEGL *cogl_renderer_egl = cogl_renderer->winsys;
 
           meta_egl_destroy_stream (egl,
                                    cogl_renderer_egl->edpy,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]