isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-04-23 18:39:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

renderer/native: fix missing GPU copy egl ext error

Browse Source 
If the extension is missing, the GPU copy path would not work. The code sets
the error, but forgets to return a failure. Fix this.

While adding the necessary return FALSE, also destroy the EGL context we just
created. Code refactoring shares the destroying code.

Found by reading code.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/416
This commit is contained in:
Pekka Paalanen 2019-01-28 13:02:07 +02:00
parent b76bf20092
commit 6932b3cbb3
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/backends/native/meta-renderer-native.c
View File

@ -3391,17 +3391,10 @@ init_secondary_gpu_data_gpu (MetaRendererNativeGpuData *renderer_gpu_data,
g_str_has_prefix (renderer_str, "softpipe") || g_str_has_prefix (renderer_str, "softpipe") ||
g_str_has_prefix (renderer_str, "swrast")) g_str_has_prefix (renderer_str, "swrast"))
{ {
meta_egl_make_current (egl,
egl_display,
EGL_NO_SURFACE,
EGL_NO_SURFACE,
EGL_NO_CONTEXT,
NULL);
meta_egl_destroy_context (egl, egl_display, egl_context, NULL);
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Do not want to use software renderer (%s), falling back to CPU copy path", "Do not want to use software renderer (%s), falling back to CPU copy path",
renderer_str); renderer_str);
return FALSE; goto out_fail_with_context;
} }
if (!meta_gles3_has_extensions (renderer_native->gles3, if (!meta_gles3_has_extensions (renderer_native->gles3,
@ -3418,6 +3411,8 @@ init_secondary_gpu_data_gpu (MetaRendererNativeGpuData *renderer_gpu_data,
missing_gl_extensions_str); missing_gl_extensions_str);
g_free (missing_gl_extensions_str); g_free (missing_gl_extensions_str);
g_free (missing_gl_extensions); g_free (missing_gl_extensions);
goto out_fail_with_context;
} }
renderer_gpu_data->secondary.is_hardware_rendering = TRUE; renderer_gpu_data->secondary.is_hardware_rendering = TRUE;
@ -3426,6 +3421,17 @@ init_secondary_gpu_data_gpu (MetaRendererNativeGpuData *renderer_gpu_data,
renderer_gpu_data->secondary.copy_mode = META_SHARED_FRAMEBUFFER_COPY_MODE_GPU; renderer_gpu_data->secondary.copy_mode = META_SHARED_FRAMEBUFFER_COPY_MODE_GPU;
return TRUE; return TRUE;
out_fail_with_context:
meta_egl_make_current (egl,
egl_display,
EGL_NO_SURFACE,
EGL_NO_SURFACE,
EGL_NO_CONTEXT,
NULL);
meta_egl_destroy_context (egl, egl_display, egl_context, NULL);
return FALSE;
} }
static void static void