isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-23 03:22:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

crtc: Move renderer private to MetaKmsCrtc

Browse Source 
It's used only by the native cursor renderer.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1287
This commit is contained in:
Jonas Ådahl 2020-02-24 22:39:02 +01:00 committed by Georges Basile Stavracas Neto
parent 620dcf3364
commit 569a183828
4 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/backends/meta-crtc.h
View File

@ -70,9 +70,6 @@ struct _MetaCrtc
/* Used when changing configuration */ /* Used when changing configuration */
gboolean is_dirty; gboolean is_dirty;
/* Used by cursor renderer backend */
void *cursor_renderer_private;
gpointer driver_private; gpointer driver_private;
GDestroyNotify driver_notify; GDestroyNotify driver_notify;
}; };

19
src/backends/native/meta-crtc-kms.c
View File

@ -39,10 +39,29 @@ typedef struct _MetaCrtcKms
MetaKmsCrtc *kms_crtc; MetaKmsCrtc *kms_crtc;
MetaKmsPlane *primary_plane; MetaKmsPlane *primary_plane;
gpointer cursor_renderer_private;
} MetaCrtcKms; } MetaCrtcKms;
static GQuark kms_crtc_crtc_kms_quark; static GQuark kms_crtc_crtc_kms_quark;
gpointer
meta_crtc_kms_get_cursor_renderer_private (MetaCrtc *crtc)
{
MetaCrtcKms *crtc_kms = crtc->driver_private;
return crtc_kms->cursor_renderer_private;
}
void
meta_crtc_kms_set_cursor_renderer_private (MetaCrtc *crtc,
gpointer cursor_renderer_private)
{
MetaCrtcKms *crtc_kms = crtc->driver_private;
crtc_kms->cursor_renderer_private = cursor_renderer_private;
}
gboolean gboolean
meta_crtc_kms_is_transform_handled (MetaCrtc *crtc, meta_crtc_kms_is_transform_handled (MetaCrtc *crtc,
MetaMonitorTransform transform) MetaMonitorTransform transform)

5
src/backends/native/meta-crtc-kms.h
View File

@ -31,6 +31,11 @@
#include "backends/native/meta-gpu-kms.h" #include "backends/native/meta-gpu-kms.h"
#include "backends/native/meta-kms-crtc.h" #include "backends/native/meta-kms-crtc.h"
gpointer meta_crtc_kms_get_cursor_renderer_private (MetaCrtc *crtc);
void meta_crtc_kms_set_cursor_renderer_private (MetaCrtc *crtc,
gpointer cursor_renderer_private);
gboolean meta_crtc_kms_is_transform_handled (MetaCrtc *crtc, gboolean meta_crtc_kms_is_transform_handled (MetaCrtc *crtc,
MetaMonitorTransform transform); MetaMonitorTransform transform);

18
src/backends/native/meta-cursor-renderer-native.c
View File

@ -272,6 +272,7 @@ set_crtc_cursor (MetaCursorRendererNative *native,
int cursor_width, cursor_height; int cursor_width, cursor_height;
MetaFixed16Rectangle src_rect; MetaFixed16Rectangle src_rect;
MetaFixed16Rectangle dst_rect; MetaFixed16Rectangle dst_rect;
struct gbm_bo *crtc_bo;
MetaKmsAssignPlaneFlag flags; MetaKmsAssignPlaneFlag flags;
int cursor_hotspot_x; int cursor_hotspot_x;
int cursor_hotspot_y; int cursor_hotspot_y;
@ -305,7 +306,8 @@ set_crtc_cursor (MetaCursorRendererNative *native,
}; };
flags = META_KMS_ASSIGN_PLANE_FLAG_NONE; flags = META_KMS_ASSIGN_PLANE_FLAG_NONE;
if (!priv->hw_state_invalidated && bo == crtc->cursor_renderer_private) crtc_bo = meta_crtc_kms_get_cursor_renderer_private (crtc);
if (!priv->hw_state_invalidated && bo == crtc_bo)
flags |= META_KMS_ASSIGN_PLANE_FLAG_FB_UNCHANGED; flags |= META_KMS_ASSIGN_PLANE_FLAG_FB_UNCHANGED;
plane_assignment = meta_kms_update_assign_plane (kms_update, plane_assignment = meta_kms_update_assign_plane (kms_update,
@ -323,7 +325,7 @@ set_crtc_cursor (MetaCursorRendererNative *native,
cursor_hotspot_x, cursor_hotspot_x,
cursor_hotspot_y); cursor_hotspot_y);
crtc->cursor_renderer_private = bo; meta_crtc_kms_set_cursor_renderer_private (crtc, bo);
if (cursor_gpu_state->pending_bo_state == META_CURSOR_GBM_BO_STATE_SET) if (cursor_gpu_state->pending_bo_state == META_CURSOR_GBM_BO_STATE_SET)
{ {
@ -343,8 +345,10 @@ unset_crtc_cursor (MetaCursorRendererNative *native,
MetaKmsCrtc *kms_crtc; MetaKmsCrtc *kms_crtc;
MetaKmsDevice *kms_device; MetaKmsDevice *kms_device;
MetaKmsPlane *cursor_plane; MetaKmsPlane *cursor_plane;
struct gbm_bo *crtc_bo;
if (!priv->hw_state_invalidated && !crtc->cursor_renderer_private) crtc_bo = meta_crtc_kms_get_cursor_renderer_private (crtc);
if (!priv->hw_state_invalidated && !crtc_bo)
return; return;
kms_crtc = meta_crtc_kms_get_kms_crtc (crtc); kms_crtc = meta_crtc_kms_get_kms_crtc (crtc);
@ -354,7 +358,7 @@ unset_crtc_cursor (MetaCursorRendererNative *native,
if (cursor_plane) if (cursor_plane)
meta_kms_update_unassign_plane (kms_update, kms_crtc, cursor_plane); meta_kms_update_unassign_plane (kms_update, kms_crtc, cursor_plane);
crtc->cursor_renderer_private = NULL; meta_crtc_kms_set_cursor_renderer_private (crtc, NULL);
} }
static float static float
@ -1050,9 +1054,11 @@ unset_crtc_cursor_renderer_privates (MetaGpu *gpu,
for (l = meta_gpu_get_crtcs (gpu); l; l = l->next) for (l = meta_gpu_get_crtcs (gpu); l; l = l->next)
{ {
MetaCrtc *crtc = l->data; MetaCrtc *crtc = l->data;
struct gbm_bo *crtc_bo;
if (bo == crtc->cursor_renderer_private) crtc_bo = meta_crtc_kms_get_cursor_renderer_private (crtc);
crtc->cursor_renderer_private = NULL; if (bo == crtc_bo)
meta_crtc_kms_set_cursor_renderer_private (crtc, NULL);
} }
} }