Rouven Czerwinski
aa78c50bf1
output: check output enabled before sending frame
...
Similar to commit 85757665e6
2021-08-17 21:07:43 +02:00
Rouven Czerwinski
59b292b691
backend/drm: return true on test if no crtc
...
This should fix the following backtrace, seen on my desktop with one
output disabled:
#0 atomic_crtc_commit (conn=0x270f5c0, state=0x270f6d0, flags=0, test_only=<optimized out>) at ../backend/drm/atomic.c:178
drm = 0x1ae9c10
output = 0x270f5c0
crtc = 0x0
modeset = false
active = false
mode_id = 43989232
gamma_lut = 0
prev_vrr_enabled = <optimized out>
vrr_enabled = <optimized out>
atom = {req = 0x270f5c0, failed = 48}
ok = <optimized out>
#1 0x00007f1104f33128 in drm_crtc_commit (conn=conn@entry=0x270f5c0, state=state@entry=0x270f6d0, flags=flags@entry=0, test_only=test_only@entry=true) at ../backend/drm/drm.c:339
__PRETTY_FUNCTION__ = "drm_crtc_commit"
drm = <optimized out>
crtc = 0x0
ok = <optimized out>
#2 0x00007f1104f34e6c in drm_connector_test (output=output@entry=0x270f5c0) at ../backend/drm/drm.c:488
conn = 0x270f5c0
unsupported = <optimized out>
#3 0x00007f1104f35424 in drm_connector_commit (output=0x270f5c0) at ../backend/drm/drm.c:578
conn = 0x270f5c0
#4 0x00007f1104f600b7 in wlr_output_commit (output=output@entry=0x270f5c0) at ../types/wlr_output.c:837
now = {tv_sec = 7732, tv_nsec = 623813006}
pre_event = {output = 0x270f5c0, when = 0x7ffecc1be570}
back_buffer = 0x0
scale_updated = <optimized out>
geometry_updated = <optimized out>
committed = <optimized out>
event = {output = 0x0, committed = 4401048, when = 0x29f38f0}
#5 0x0000000000433047 in apply_output_config (oc=oc@entry=0x29f38f0, output=output@entry=0x2710720) at ../sway/config/output.c:431
wlr_output = 0x270f5c0
output_box = <optimized out>
#6 0x0000000000433aaf in apply_output_config_to_outputs (oc=0x2308400) at ../sway/config/output.c:649
current = 0x29f38f0
name = <optimized out>
wildcard = true
id = "Dell Inc. DELL U2410 F525M9AK0MML\000\060\060\060ACD7\000\000\000\000\000\000\000\220\063\240\002\000\000\000\000L5C\000\000\000\000\000\377\377\377\377\000\000\000\000\377\377\377\377\000\000\000\000\377\377\377\377\000\000\000\000\377\377\377\377\000\000\000\000\355\240E\000\000\000\000\000\377\377\377\377\000\000\000\000@\206+\002\000\000\000\000`\260.\002\000\000\000"
sway_output = 0x2710720
tmp = 0x2242030
seat = <optimized out>
#7 0x000000000043df6b in cmd_output (argc=<optimized out>, argv=0x2a03390) at ../sway/commands/output.c:108
error = <optimized out>
output = <optimized out>
background = false
#8 0x0000000000410304 in execute_command (_exec=_exec@entry=0x2975d20 "output * dpms off", seat=0x22a3280, seat@entry=0x0, con=con@entry=0x0) at ../sway/commands.c:291
res = <optimized out>
argc = 4
argv = 0x2a03370
handler = 0x479230 <handlers+560>
cmd = <optimized out>
matched_delim = 0 '\000'
containers = 0x0
using_criteria = false
__PRETTY_FUNCTION__ = "execute_command"
exec = 0x28f63c0 "output * dpms off"
head = 0x0
res_list = 0x2a2e9d0
#9 0x0000000000418b65 in ipc_client_handle_command (client=client@entry=0x2a6ac80, payload_length=<optimized out>, payload_type=IPC_COMMAND) at ../sway/ipc-server.c:645
line = <optimized out>
res_list = <optimized out>
json = <optimized out>
length = <optimized out>
__PRETTY_FUNCTION__ = "ipc_client_handle_command"
buf = 0x2975d20 "output * dpms off"
#10 0x000000000041964c in ipc_client_handle_readable (client_fd=<optimized out>, mask=<optimized out>, data=0x2a6ac80) at ../sway/ipc-server.c:267
pending_length = <optimized out>
pending_type = <optimized out>
client = 0x2a6ac80
read_available = 31
buf = "i3-ipc\021\000\000\000\000\000\000"
received = 14
#11 0x00007f1104fc3492 in wl_event_loop_dispatch () from /nix/store/ridk7k2ka6dbk4ly7qqjgmc523s4fj89-wayland-1.19.0/lib/libwayland-server.so.0
No symbol table info available.
#12 0x00007f1104fc1135 in wl_display_run () from /nix/store/ridk7k2ka6dbk4ly7qqjgmc523s4fj89-wayland-1.19.0/lib/libwayland-server.so.0
No symbol table info available.
#13 0x000000000041ac10 in server_run (server=server@entry=0x47b0c0 <server>) at ../sway/server.c:261
No locals.
#14 0x000000000041a3fc in main (argc=<optimized out>, argv=0x7ffecc1bec68) at ../sway/main.c:395
verbose = 0
debug = 0
validate = 0
allow_unsupported_gpu = 0
long_options = {{name = 0x45b516 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x45ee69 "config", has_arg = 1, flag = 0x0, val = 99}, {name = 0x45b51b "validate", has_arg = 0, flag = 0x0, val = 67}, {
name = 0x45b524 "debug", has_arg = 0, flag = 0x0, val = 100}, {name = 0x45b3ac "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x45a55c "verbose", has_arg = 0, flag = 0x0, val = 86}, {name = 0x45b52a "get-socketpath",
has_arg = 0, flag = 0x0, val = 112}, {name = 0x45b539 "unsupported-gpu", has_arg = 0, flag = 0x0, val = 117}, {name = 0x45b549 "my-next-gpu-wont-be-nvidia", has_arg = 0, flag = 0x0, val = 117}, {name = 0x0, has_arg = 0,
flag = 0x0, val = 0}}
config_path = 0x0
usage = 0x45b830 "Usage: sway [options] [command]\n\n -h, --help", ' ' <repeats 13 times>, "Show help message and quit.\n -c, --config <config> Specify a config file.\n -C, --validate Check the validity of the config file, th"...
c = <optimized out>
where the second output is not enabled:
(gdb) frame 4
#4 0x00007f1104f600b7 in wlr_output_commit (output=output@entry=0x270f5c0) at ../types/wlr_output.c:837
837 in ../types/wlr_output.c
(gdb) p output->enabled
$3 = false
(gdb)
The culprit being that since 604674dc54
2021-08-17 14:07:51 +02:00
Simon Ser
7544b7abf9
backend/drm: use addon for wlr_drm_fb
2021-08-17 11:08:45 +02:00
Michele Sorcinelli
cae7b98136
xwayland: do not free cursor in handle_server_ready()
...
If XWayland terminates for any reason, xwm_set_cursor() has to
to be called again, so the cursor has to stick around.
2021-08-17 09:17:59 +02:00
Tudor Brindus
0c19a28266
input/tablet: fix wl_array_for_each usage on tablet proximity
...
Looks like this instance was missed in
e035f2b9c4Fixes #3110 .
2021-08-15 23:26:51 +02:00
Isaac Freund
3364eec07e
layer-shell: replace close() with destroy()
...
The protocol specifies that all requests (aside from destroy) are
ignored after the compositor sends the closed event. Therefore,
destroying the wlroots object and rendering the resource inert
when sending the closed event keeps things simpler for wlroots and
compositors.
2021-08-14 20:25:46 +02:00
Simon Ser
ad7651a370
render/gles2: make wlr_gles2_texture a wlr_buffer addon
2021-08-12 10:22:19 +02:00
Simon Ser
ee1156b62b
render/gles2: make wlr_gles2_buffer an addon
...
Saves us from walking a list.
2021-08-12 10:22:19 +02:00
Simon Ser
93964012e6
buffer: add addon set
...
This allows wlr_buffer users to extend it with tjeir own state.
2021-08-12 10:22:19 +02:00
Simon Ser
20404ed8bb
surface: drop surface_state_copy
...
This function was weird because it copied some fields but not all.
2021-08-11 18:13:12 +02:00
Simon Ser
3f9e4f7a44
surface: kill wlr_surface.previous
...
This wlr_surface_state field was a special case because we don't
want to save the whole current state: for instance, the wlr_buffer
must not be saved or else wouldn't get released soon enough.
Let's just inline the state fields we need instead.
2021-08-11 18:13:12 +02:00
Kirill Primak
111d4eafd7
util/addon: find both by owner and impl
...
This allows to have multiple addons of different types with the same
owner.
2021-08-11 18:12:57 +02:00
Kirill Primak
debd6c5f0b
wlr_output_layout: use wlr_addons
2021-08-10 19:15:48 +02:00
Kirill Primak
11f799e88e
wlr_outputs: add wlr_addon_set
2021-08-10 19:15:48 +02:00
Kirill Primak
a6a80850b7
util: add wlr_addon
2021-08-10 19:15:48 +02:00
Simon Ser
604674dc54
backend/drm: always perform a test commit in drm_connector_test
...
This allows callers to use wlr_output_test to check whether a mode
can be enabled, for instance.
Closes: https://github.com/swaywm/wlroots/issues/2250
2021-08-10 16:38:22 +02:00
Simon Ser
eb0ce659cf
backend/drm: add proper error handling to wlr_drm_backend_create
...
Some listeners weren't removed and caused a use-after-free with
e.g. vkms when used as a secondary GPU.
2021-08-10 15:42:36 +02:00
Simon Ser
88f65db87f
ci: add smoke test
...
Add a very basic smoke test which uses VKMS to fire up the DRM
backend.
2021-08-08 22:13:33 +02:00
Tudor Brindus
033c9cab74
input/pointer: try harder to not send duplicate motion events
...
wl_fixed_t is a 32-bit data type, but our doubles are 64-bit. This meant
that two doubles that would map to the same wl_fixed_t could compare
unequal, and send a duplicate motion event.
Refs swaywm/sway#4632 .
2021-08-07 09:04:12 +02:00
Simon Ser
c27263c105
seat: allow compositors to not load a keymap
...
The protocol allows compositors to not send any keymap to Wayland
clients. Handle a keymap-less keyboard correctly by sending
WL_KEYBOARD_KEYMAP_FORMAT_NO_KEYMAP instead of erroring out in the
mmap call.
2021-08-06 23:06:29 +02:00
Simon Ser
d48ffac56b
build: remove "." from include dirs
2021-08-06 19:44:35 +02:00
Simon Ser
ca0b19fc9c
examples/fullscreen-shell: remove unused render_data.view field
2021-08-06 18:27:31 +02:00
Simon Ser
1936e136df
backend/drm: require buffer on modeset in drm_connector_test
...
When testing a modeset, make sure the caller has also provided a
buffer. This allows df0e75ba05https://github.com/swaywm/wlroots/issues/3086
2021-08-04 22:51:40 +02:00
Simon Ser
df0e75ba05
output: try skipping buffer allocation if the backend allows it
...
When enabling an output, skip the empty buffer allocation if the
backend accepts modesets without a buffer.
This fixes mode-setting with the noop backend.
2021-08-04 10:18:59 -04:00
Simon Ser
8a3cd28973
render/pixman/pixel_format: add more formats
...
Add a bunch of new formats for Pixman: a few missing 32-bit ones,
some 16-bit and 32-bit formats as well.
Mostly based on a Weston patch [1].
[1]: https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/664
2021-08-03 02:53:03 -04:00
Simon Ser
b913e64f95
render/pixel_format: add more formats for Pixman
...
These will be added to Pixman in the next commit.
2021-08-03 02:53:03 -04:00
Simon Ser
923258b0be
backend/drm: preserve mode order from kernel
...
The kernel orders the mode list from highest to lowest. Preserve
this ordering in the wlr_output.modes list.
2021-08-02 09:28:21 -04:00
Kirill Primak
f12bacf4b4
surface: don't cache frame callback lists
2021-08-02 09:10:10 +02:00
Quantum
456c6e2279
viewporter: remove crop and scale state upon destruction
...
According to the viewport protocol, upon wp_viewport::destroy():
> The associated wl_surface's crop and scale state is removed.
> The change is applied on the next wl_surface.commit.
Therefore, wp_viewport_destroy(viewport) should remove all viewport state.
Currently, wlroots does not remove the crop and scale state. Instead, a
client must do:
wl_fixed_t clear = wl_fixed_from_int(-1);
wp_viewport_set_source(viewport, clear, clear, clear, clear);
wp_viewport_set_destination(viewport, -1, -1);
wp_viewport_destroy(viewport);
This commit adds the necessary logic into viewport_destroy and makes
wlroots comply with the protocol.
2021-08-02 09:08:03 +02:00
Manuel Stoeckl
f5df956c18
render/gles2: add a few 10-bit and FP16 formats
...
The half-float formats depend on GL_OES_texture_half_float_linear,
not just the GL_OES_texture_half_float extension, because the latter
does not include support for linear magni/minification filters.
The new 2101010 and 16161616F formats are only available on little-
endian builds, since their gl_types are larger than a byte and thus
endianness dependent.
2021-07-30 08:29:13 +02:00
Manuel Stoeckl
44e8451cd9
render/gles2: hide shm formats without GL support
...
This change introduces a new function to check whether the renderer
has the needed GL extensions to read a given pixel format.
2021-07-30 08:29:13 +02:00
Manuel Stoeckl
4dc52bcb6c
render/pixel-format: add a few 10-bit and FP16 formats
2021-07-30 08:29:13 +02:00
Simon Ser
f76960388f
render/gles2: add support for some 24 and 16-bit formats
...
On little-endian, we can enable pixel formats which don't use
gl_type = GL_UNSIGNED_BYTE. See [1].
[1]: https://afrantzis.com/pixel-format-guide/
2021-07-29 10:47:34 -04:00
Simon Ser
6973361d60
render/pixel-format: add some 24 and 16-bit formats
2021-07-29 10:47:34 -04:00
Simon Ser
3132c0ab10
output: drop wlr_output_state.buffer_type
...
This is now unconditionally set to WLR_OUTPUT_STATE_BUFFER_SCANOUT.
2021-07-29 09:48:33 -04:00
Simon Ser
f211bc983a
output-damage: stop using enum wlr_output_state_buffer_type
...
This enum will get dropped in the next commit.
2021-07-29 09:48:33 -04:00
Simon Ser
4ddde1a7bd
output: drop wlr_output_impl.{attach,rollback}_render
...
No backend uses these anymore.
2021-07-29 09:48:33 -04:00
Simon Ser
d17a009062
backend/noop: drop attach_render/rollback_render
...
We no longer require wlr_output_impl.{attach,rollback}_render to
be populated.
2021-07-29 09:48:33 -04:00
Simon Ser
55ac7e335a
backend/drm: fix wrong type for get_cursor_format return values
...
These are bools but should be pointers.
2021-07-28 16:59:21 -04:00
Simon Ser
c55f70c8b7
backend/drm: stop initializing renderer for parent backend
...
Unless we're dealing with a multi-GPU setup and the backend being
initialized is secondary, we don't need a renderer nor an allocator.
Stop initializing these.
2021-07-28 22:52:35 +02:00
Simon Ser
c74dc45bb6
backend/drm: drop get_renderer implementation
...
We can now just rely on the common code for this.
2021-07-28 22:52:35 +02:00
Simon Ser
9b99570869
backend/drm: drop drm_surface_{make,unset}_current
2021-07-28 22:52:35 +02:00
Simon Ser
ebb661532c
backend/drm: remove SCANOUT check in drm_connector_test
...
We only accept SCANOUT, the buffer type should never be set to RENDER.
2021-07-28 22:52:35 +02:00
Simon Ser
f5900c1f00
backend/drm: remove primary swapchain
...
We can't nuke it completely, we still need it for multi-GPU.
2021-07-28 22:52:35 +02:00
Simon Ser
85d7ad2eef
backend/drm: allow legacy scan-out if FB props match
...
Historically we haven't allowed direct scan-out for legacy KMS,
because legacy misses the functionality to make sure a buffer can
be scanned out. However with renderer v6 the backend can't figure
out anymore whether the buffer comes from its internal swap-chain,
because the backend doesn't have an internal swap-chain.
The legacy KMS API guarantees that the driver won't reject a buffer
as long as it's been allocated with the same parameters as the
previous one. Let's check this in legacy_crtc_test.
2021-07-28 22:52:35 +02:00
Simon Ser
6aadf811aa
output: fallback to modifier-less allocation on modeset test failure
...
Sometimes we allocate a buffer with modifiers but then fail to
perform a modeset with it. This can happen on Intel because of
bandwidth limitations. To mitigate this issue, it's possible to
re-allocate the buffer with modifiers.
Add the logic to do so in wlr_output.
2021-07-28 22:52:35 +02:00
Simon Ser
0fb55c76d0
output: allocate and attach empty buffer on modeset
...
Some backends need a buffer in order to be able to perform a
modeset.
2021-07-28 22:52:35 +02:00
Simon Ser
1a5b6722a8
output: use pending resolution when allocating swapchain
...
This allows the swapchain to be created with the correct resolution
during a mode change.
2021-07-28 22:52:35 +02:00
Simon Ser
d6f0fc251e
backend/drm: implement get_primary_formats
2021-07-28 22:52:35 +02:00
Simon Ser
d1c931cbe8
output: fallback to XRGB in output_pick_format
...
This will be necessary for the primary buffer.
2021-07-28 22:52:35 +02:00
