diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2019-05-20 21:27:34 +0200 |
|---|---|---|
| committer | Georges Basile Stavracas Neto <georges.stavracas@gmail.com> | 2019-05-21 14:55:38 +0000 |
| commit | 6eeba2434aa55d27d81fc9701573e4d9834504de (patch) | |
| tree | e37fa68e2c8ea234688b99af693dbe18edef1ab3 | |
| parent | 7fb7b28cd69bba7459cc02659374725e00d06c1d (diff) | |
| download | mutter-6eeba2434aa55d27d81fc9701573e4d9834504de.tar.gz | |
drm-buffer: Clean up file descriptor variable naming
Nowhere else is it called 'drm_fd' so lets not get rid of this
inconsistency.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/584
| -rw-r--r-- | src/backends/native/meta-drm-buffer.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/backends/native/meta-drm-buffer.c b/src/backends/native/meta-drm-buffer.c index b2db2083d..298f2cba7 100644 --- a/src/backends/native/meta-drm-buffer.c +++ b/src/backends/native/meta-drm-buffer.c @@ -78,7 +78,7 @@ meta_drm_buffer_acquire_swapped_buffer (MetaDrmBuffer *buffer, uint32_t width, height, format; struct gbm_bo *bo; int i; - int drm_fd; + int kms_fd; g_return_val_if_fail (META_IS_DRM_BUFFER (buffer), FALSE); g_return_val_if_fail (buffer->type == META_DRM_BUFFER_TYPE_GBM, FALSE); @@ -87,8 +87,7 @@ meta_drm_buffer_acquire_swapped_buffer (MetaDrmBuffer *buffer, g_return_val_if_fail (buffer->gbm.gpu_kms != NULL, FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - drm_fd = meta_gpu_kms_get_fd (buffer->gbm.gpu_kms); - g_return_val_if_fail (drm_fd >= 0, FALSE); + kms_fd = meta_gpu_kms_get_fd (buffer->gbm.gpu_kms); bo = gbm_surface_lock_front_buffer (buffer->gbm.surface); if (!bo) @@ -125,7 +124,7 @@ meta_drm_buffer_acquire_swapped_buffer (MetaDrmBuffer *buffer, if (use_modifiers && modifiers[0] != DRM_FORMAT_MOD_INVALID) { - if (drmModeAddFB2WithModifiers (drm_fd, + if (drmModeAddFB2WithModifiers (kms_fd, width, height, format, @@ -145,7 +144,7 @@ meta_drm_buffer_acquire_swapped_buffer (MetaDrmBuffer *buffer, return FALSE; } } - else if (drmModeAddFB2 (drm_fd, + else if (drmModeAddFB2 (kms_fd, width, height, format, @@ -166,7 +165,7 @@ meta_drm_buffer_acquire_swapped_buffer (MetaDrmBuffer *buffer, return FALSE; } - if (drmModeAddFB (drm_fd, + if (drmModeAddFB (kms_fd, width, height, 24, @@ -205,8 +204,10 @@ meta_drm_buffer_finalize (GObject *object) if (buffer->gbm.gpu_kms != NULL && buffer->gbm.fb_id != INVALID_FB_ID) { - int drm_fd = meta_gpu_kms_get_fd (buffer->gbm.gpu_kms); - drmModeRmFB (drm_fd, buffer->fb_id); + int kms_fd; + + kms_fd = meta_gpu_kms_get_fd (buffer->gbm.gpu_kms); + drmModeRmFB (kms_fd, buffer->fb_id); buffer->fb_id = INVALID_FB_ID; } |