Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Plasma
KWin
Commits
cb9ccdb0
Commit
cb9ccdb0
authored
Nov 17, 2020
by
Xaver Hugl
Committed by
Vlad Zahorodnii
Nov 17, 2020
Browse files
Don't check atomic property non_desktop when not using atomic mode setting
parent
871611e9
Changes
2
Hide whitespace changes
Inline
Side-by-side
plugins/platforms/drm/drm_gpu.cpp
View file @
cb9ccdb0
...
...
@@ -131,13 +131,15 @@ bool DrmGpu::updateOutputs()
auto
it
=
std
::
find_if
(
m_connectors
.
constBegin
(),
m_connectors
.
constEnd
(),
[
currentConnector
]
(
DrmConnector
*
c
)
{
return
c
->
id
()
==
currentConnector
;
});
if
(
it
==
m_connectors
.
constEnd
())
{
auto
c
=
new
DrmConnector
(
currentConnector
,
m_fd
);
if
(
m_atomicModeSetting
&&
!
c
->
atomicInit
())
{
delete
c
;
continue
;
}
if
(
c
->
isNonDesktop
())
{
delete
c
;
continue
;
if
(
m_atomicModeSetting
)
{
if
(
!
c
->
atomicInit
())
{
delete
c
;
continue
;
}
if
(
c
->
isNonDesktop
())
{
delete
c
;
continue
;
}
}
m_connectors
<<
c
;
}
else
{
...
...
plugins/platforms/drm/drm_object_connector.h
View file @
cb9ccdb0
...
...
@@ -37,7 +37,11 @@ public:
bool
isConnected
();
bool
isNonDesktop
()
const
{
return
m_props
.
at
(
static_cast
<
int
>
(
PropertyIndex
::
NonDesktop
))
->
value
();
auto
prop
=
m_props
.
at
(
static_cast
<
int
>
(
PropertyIndex
::
NonDesktop
));
if
(
!
prop
)
{
return
false
;
}
return
prop
->
value
();
}
private:
QVector
<
uint32_t
>
m_encoders
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment