Nyaaori/gamescope
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

drm: simplify rotation in drm_prepare_basic

Browse source
This commit is contained in:
Simon Ser 2021-02-25 17:11:00 +01:00
parent 141f2cf374
commit 29a23e90e1
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/drm.cpp
View file

@ -841,28 +841,29 @@ drm_prepare_basic( struct drm_t *drm, struct Composite_t *pComposite, struct Vul
pPipeline->layerBindings[ 0 ].surfaceWidth, pPipeline->layerBindings[ 0 ].surfaceWidth,
pPipeline->layerBindings[ 0 ].surfaceHeight ); pPipeline->layerBindings[ 0 ].surfaceHeight );
int64_t crtcX = pComposite->data.layers[ 0 ].flOffsetX * -1;
int64_t crtcY = pComposite->data.layers[ 0 ].flOffsetY * -1;
int64_t crtcW = pPipeline->layerBindings[ 0 ].surfaceWidth / pComposite->data.layers[ 0 ].flScaleX;
int64_t crtcH = pPipeline->layerBindings[ 0 ].surfaceHeight / pComposite->data.layers[ 0 ].flScaleY;
if ( g_bRotated ) if ( g_bRotated )
{ {
add_plane_property(drm, req, plane_id, "CRTC_X", pComposite->data.layers[ 0 ].flOffsetY * -1); int64_t tmp = crtcX;
add_plane_property(drm, req, plane_id, "CRTC_Y", pComposite->data.layers[ 0 ].flOffsetX * -1); crtcX = crtcY;
crtcY = tmp;
add_plane_property(drm, req, plane_id, "CRTC_H", pPipeline->layerBindings[ 0 ].surfaceWidth / pComposite->data.layers[ 0 ].flScaleX);
add_plane_property(drm, req, plane_id, "CRTC_W", pPipeline->layerBindings[ 0 ].surfaceHeight / pComposite->data.layers[ 0 ].flScaleY);
}
else
{
add_plane_property(drm, req, plane_id, "CRTC_X", pComposite->data.layers[ 0 ].flOffsetX * -1);
add_plane_property(drm, req, plane_id, "CRTC_Y", pComposite->data.layers[ 0 ].flOffsetY * -1);
add_plane_property(drm, req, plane_id, "CRTC_W", pPipeline->layerBindings[ 0 ].surfaceWidth / pComposite->data.layers[ 0 ].flScaleX);
add_plane_property(drm, req, plane_id, "CRTC_H", pPipeline->layerBindings[ 0 ].surfaceHeight / pComposite->data.layers[ 0 ].flScaleY);
gpuvis_trace_printf ( "crtc %i+%i@%ix%i\n", tmp = crtcW;
(int)pComposite->data.layers[ 0 ].flOffsetX * -1, (int)pComposite->data.layers[ 0 ].flOffsetY * -1, crtcW = crtcH;
(int)(pPipeline->layerBindings[ 0 ].surfaceWidth / pComposite->data.layers[ 0 ].flScaleX), crtcH = tmp;
(int)(pPipeline->layerBindings[ 0 ].surfaceHeight / pComposite->data.layers[ 0 ].flScaleX) );
} }
add_plane_property(drm, req, plane_id, "CRTC_X", crtcX);
add_plane_property(drm, req, plane_id, "CRTC_Y", crtcY);
add_plane_property(drm, req, plane_id, "CRTC_W", crtcW);
add_plane_property(drm, req, plane_id, "CRTC_H", crtcH);
gpuvis_trace_printf ( "crtc %li,%li %lix%li\n", crtcX, crtcY, crtcW, crtcH );
unsigned test_flags = (drm->flags & DRM_MODE_ATOMIC_ALLOW_MODESET) | DRM_MODE_ATOMIC_TEST_ONLY; unsigned test_flags = (drm->flags & DRM_MODE_ATOMIC_ALLOW_MODESET) | DRM_MODE_ATOMIC_TEST_ONLY;
int ret = drmModeAtomicCommit( drm->fd, drm->req, test_flags, NULL ); int ret = drmModeAtomicCommit( drm->fd, drm->req, test_flags, NULL );