nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-25 08:32:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,135 Commits 70 Branches 31 Tags 21 MiB
de574ac098
Commit Graph

835 Commits

Author SHA1 Message Date
Kirill Primak
20b99ed854 render/drm_format_set: fix possible leak on realloc error 2024-01-17 15:44:37 +00:00
Kirill Primak
3eb89e5325 render/vulkan: fix possible double free 2024-01-17 15:44:37 +00:00
Simon Ser
a0b1329ee6 Fix bool return types 
This makes wlroots build in C23 mode.

C23 is more strict and rejects implicit conversions from bool to a
pointer.
 2024-01-04 22:24:06 +01:00
Simon Ser
2f2a55ebd3 render: stop auto-creating wl_drm 
wl_drm is a legacy interface superseded by the linux-dmabuf
protocol. All clients should migrate.

As a first step, stop creating the wl_drm global by default.
This should let us discover any remaining issues in clients.
Compositors can still manually create the global if they want to.
As a second step, we can completely drop our implementation.
 2024-01-03 20:52:34 +00:00
Roman Gilg
3531007b75 render/pixman: add wlr_pixman_renderer_get_buffer_image() 
This is similar to wlr_pixman_texture_get_image and can be useful for
compositors to access the rendering data.
 2023-12-11 19:47:55 +01:00
Simon Ser
1f64f3925c render/gles2: add wlr_gles2_renderer_get_buffer_fbo() 
Replacement for wlr_gles2_renderer_get_current_fbo(). Wayfire uses
it for instance.
 2023-12-05 18:57:43 +01:00
Simon Ser
4ed8df9ab2 render: disable linux-dmabuf without DRM FD 
linux-dmabuf used to not need a DRM FD, however since v4 a DRM FD
is required for the main_device event.
 2023-12-04 15:28:18 +00:00
Manuel Stoeckl
d6859da3b4 render/vulkan: use _SRGB image view when possible 
This is the last of a set of commits which ensures that both textures
and render buffers can be accessed through _UNORM and _SRGB image
views. While _UNORM image views are not yet used for 8-bpc image
formats, they will be needed in the future to support color transforms
for both textures and render buffers.
 2023-12-04 15:13:31 +00:00
Manuel Stoeckl
566c413d8f render/vulkan: constify vulkan_format_props_find_modifier 2023-12-04 15:13:31 +00:00
Manuel Stoeckl
88a4b9eefd render/vulkan: create VkImage with option for _SRGB view, if possible 2023-12-04 15:13:31 +00:00
Manuel Stoeckl
fd4548bb93 render/vulkan: detect which _UNORM formats support _SRGB views 2023-12-04 15:13:31 +00:00
Manuel Stoeckl
acc70ee3a5 render/vulkan: extract shm texture format query into function 2023-12-04 15:13:31 +00:00
Manuel Stoeckl
eab89d6c76 render/vulkan: track and use _UNORM variants of _SRGB formats 
Later commits will start using _SRGB image views again,
where appropriate.
 2023-12-04 15:13:31 +00:00
Alexander Orzechowski
6e03d3015e swapchain: Add wlr_swapchain_has_buffer 2023-12-03 05:29:05 +00:00
Alexander Orzechowski
d3a339a03e renderer: Drop buffer binding 2023-11-30 20:11:50 -05:00
Alexander Orzechowski
3ed1268f64 render: Nuke old read pixels API 
Sadly, the new API is not backwards compatible with the old API. Since
we have already switched all users in wlroots to the new API compositors
are already practically mandated to implement the new API. Let's get rid
of the old one since there is no point.
 2023-11-30 20:01:12 -05:00
Alexander Orzechowski
c5a3c5ca4c render: Implement texture_preferred_read_format 2023-11-30 20:01:12 -05:00
Alexander Orzechowski
57b18d26d0 wlr_texture: Introduce wlr_texture_preferred_read_format 2023-11-30 19:56:54 -05:00
Alexander Orzechowski
09f16b2a9c render/vulkan: Implement texture_read_pixels 2023-11-30 19:56:54 -05:00
Alexander Orzechowski
e7055b4840 render/gles2: Implement texture_read_pixels 
Also get rid of gles2_texture.owns_texture. We only use the tex/fbo
 2023-11-30 19:56:41 -05:00
Alexander Orzechowski
01bd098166 render/pixman: Implement texture_read_pixels 2023-11-30 19:56:17 -05:00
Alexander Orzechowski
e85e8bc324 wlr_texture: Introduce wlr_texture_read_pixels_options helpers 2023-11-30 19:55:51 -05:00
Alexander Orzechowski
4c6caa7c48 wlr_texture: Introduce wlr_texture_read_pixels 2023-11-30 19:55:12 -05:00
Simon Ser
e8b187cc92 render/gles2: save/restore context when creating/submitting a render pass 
This is useful for e.g. lazily blitting a texture for readback
purposes while rendering.
 2023-11-30 17:47:11 +01:00
Simon Ser
876d789ad5 render/gles2: reword wlr_gles2_texture comments 
These comments were a bit misleading:

- "GL_TEXTURE_2D == mutable": not really, imported non-external-only
  DMA-BUFs would also use this target, but are not mutable.
- "Only affects target == GL_TEXTURE_2D": same here.
- "If imported from a wlr_buffer": not really, would be NULL if
  imported from a shm wlr_buffer.

Adjust these comments to better reflect reality and adjust the check
in gles2_texture_update_from_buffer().
 2023-11-30 16:38:25 +01:00
Alexander Orzechowski
84bef5c0c2 render/gles2: Inline texture invalidation 
Let's us share more code with the other code path
 2023-11-30 10:13:18 -05:00
Alexander Orzechowski
9bf51e744e render/gles2: Don't attach texture as buffer addon 
Since wlr_gles2_buffer is now managing importing for us, there is
no reason for us to continue doing this.
 2023-11-30 10:13:18 -05:00
Alexander Orzechowski
829e34b305 render/gles2: Don't track image in texture 
We can get it from the buffer
 2023-11-30 10:13:18 -05:00
Alexander Orzechowski
cb5f67431b render/gles2: Don't double import dmabuf 
We can double import a dmabuf if we use it as a texture target and
a render target. Instead, let's unify render targets and texture dmabuf
imports to use wlr_gles2_buffer which manages the EGLImageKHR
 2023-11-30 10:13:18 -05:00
Alexander Orzechowski
665055a1a0 render/gles2: Destroy textures first 
Since imported textures will be based off of gles2_buffer we have
to destroy textures first or else they will have an invalid reference
to the buffers they are imported from.
 2023-11-30 10:13:18 -05:00
Alexander Orzechowski
484e248446 renderer/gles2: Bail rendering to external buffers when binding them 
We can't do it while we're creating them because we'll want to use
gles2 buffers for textures soon.
 2023-11-30 10:13:18 -05:00
Alexander Orzechowski
0d9cd6932a render/gles2: Lazily create buffer fbo 2023-11-30 10:13:18 -05:00
Alexander Orzechowski
d7ecdad4e0 render: Drop rendering_with_buffer 
This is always true now that we can only render with a buffer.
 2023-11-29 16:00:24 -05:00
Alexander Orzechowski
3faf9883dc renderer: Drop wlr_renderer_begin 2023-11-29 15:13:24 -05:00
Simon Ser
62b6c492d5 render/gles2: check external-only flag in get_or_create_buffer() 
If the external-only flag is set, then the EGLImage is only
supported for use with GL_TEXTURE_EXTERNAL_OES texture targets.
In particular, the EGLImage cannot be bound to a RBO.
 2023-11-29 15:28:50 +00:00
Alexander Orzechowski
9118226634 render/gles2: Don't track has_alpha in pixel_format 
Why track the alpha here when we can already get that information
elsewhere?
 2023-11-29 13:25:06 +01:00
Simon Ser
395a08f5d1 render/egl: fallback to GBM FD if EGLDevice is not available 
It's possible that we don't have an EGLDevice if we created the
EGL context from a GBM device. Let's ensure all GPU-accelerated
renderers always have a DRM FD to return by falling back to GBM's
FD.
 2023-11-28 13:12:43 +00:00
Simon Ser
9a0a4ce221 render/vulkan: drop current_command_buffer 
This was used by the legacy rendering API. Since begin()/end()
only need to set current_render_buffer and nothing else, we can
drop all of these bits.
 2023-11-28 12:56:30 +00:00
Simon Ser
56ec13596a Cleanup wlr_matrix.h includes 
Many files used to require wlr_matrix but no longer do.
 2023-11-25 08:37:43 +01:00
Simon Ser
9e702e9cfe util/transform: move over wl_output_transform helpers 
These aren't really tied to wlr_output.
 2023-11-23 11:03:57 +01:00
Simon Ser
41494244df render: drop legacy rendering API 2023-11-22 11:43:05 +01:00
Simon Ser
b2aac3390d render/vulkan: drop legacy rendering API 2023-11-22 11:36:17 +01:00
Simon Ser
514caea437 render/pixman: drop legacy rendering API 2023-11-22 11:34:32 +01:00
Simon Ser
4635717d82 render/gles2: drop legacy rendering API 2023-11-22 11:33:10 +01:00
Simon Ser
40633ae7fd render: drop legacy render pass 
All built-in renderers now implement the new API.
 2023-11-22 00:55:56 +01:00
Manuel Stoeckl
dbe7fb7027 render/vulkan: undo alpha premult for 8-bpc ARGB/ABGR 
When a texel from the Vulkan format VK_FORMAT_B8G8R8A8_SRGB is read,
the sRGB to linear conversion is applied independently to the R, G,
and B channels; the A channel has no influence on this. However,
DRM_FORMAT_ARGB8888 buffers are, per Wayland protocol, not encoded
in this fashion; one must first unpremultiply the color channels
before doing sRGB to linear conversion. This commit switches to
handling ARGB8888 and ABGR8888 formats using the general fragment
shader conversion from electrical to optical values.
 2023-11-21 11:08:55 +00:00
JiDe Zhang
8ebfeffdc8 Remove unnecessary code 
Not needs set GL_DEPTH_TEST, Because when rendering to a framebuffer
that has no depth buffer, depth testing always behaves as though
the test is disabled, The initial value for each capability with
the exception of GL_DITHER is GL_FALSE.
 2023-10-31 15:59:38 +00:00
eri
3232697252 render/vulkan: use VK_KHR_global_priority 
References: #3386
 2023-10-26 16:17:57 +00:00
Simon Zeni
1c2f608331 render/vulkan: remove unused queue_props in renderer 2023-10-26 15:12:58 +00:00
Brett Ernst
47bf87ade2 renderer/vulkan: don't add two alphas together in blend func 2023-10-21 17:25:46 +00:00
Simon Ser
5adf325333 render/vulkan: undo alpha premult before sRGB encoding/decoding 
sRGB encoding/decoding needs to happen with straight alpha, not
pre-multiplied alpha.
 2023-10-17 17:28:56 +02:00
Simon Ser
0b15b4a6ae render/allocator: log message when GBM is disabled 
When the backend and renderer would need GBM but it's disabled at
compile-time, log a message to make this situation easier to debug.
 2023-10-06 09:10:31 +00:00
Simon Ser
db7751f39e render: log error when requested renderer is compile-time disabled 
It can be a bit confusing to debug when the user requests an
explicit renderer but it's disabled at build-time. Log an error
when that happens.
 2023-10-06 09:10:31 +00:00
Manuel Stoeckl
e0adaaffb6 render/vulkan: constrain blend to output subpass to redrawn region 
This commit only applies to the render pass API.
 2023-10-05 11:45:32 +00:00
Alexander Orzechowski
d817ebb80f renderer: Don't crash when trying to fallback to pixman 
Pixman won't be chosen by default if the system has a valid render node
but gles2 and vulkan creation failed.
 2023-10-05 05:14:54 -04:00
Alexander Orzechowski
4f92ecde82 renderer_autocreate_with_drm_fd: Ensure fd isn't bogus 2023-10-05 05:00:44 -04:00
Alexander Orzechowski
1b0694b794 treewide: Migrate from sizeof(struct) to sizeof(*pointer) where practical 2023-10-03 01:51:07 -04:00
Alexander Orzechowski
98a745d926 render/pass: Remove empty box early return 2023-09-21 02:25:34 -04:00
Alexander Orzechowski
e9706e62f5 renderer: Use wlr_render_rect_options_get_box 
Fixes: #3697
 2023-09-21 02:25:34 -04:00
Alexander Orzechowski
5299d973d5 render/pass: Introduce wlr_render_rect_options_get_box 2023-09-21 02:25:34 -04:00
Manuel Stoeckl
5aea90264f render/vulkan: fix validation error with vkCmdBlitImage 
Specfically, VUID-vkCmdBlitImage-srcImage-00247.
 2023-09-10 15:28:57 -04:00
Simon Ser
65bbbbbf0c render/vulkan: de-duplicate VkImageUsageFlags 
The flags passed to vkCreateImage() must match the flags used when
querying formats. Make this clearer by using the same variable.
 2023-09-09 23:32:28 +00:00
Simon Ser
7bf6c1fc6c render/pass: ensure rect has positive size 
Ported from wlr_render_rect().
 2023-08-24 03:54:36 +00:00
Manuel Stoeckl
a94168b5fe render: ensure wlr_render_rect_options->box is nonempty 
This optimization also fixes an validation error with the Vulkan
renderer by ensuring vkCmdClearAttachments does not receive empty
regions.
 2023-08-23 18:28:58 +00:00
Simon Ser
11aba53ead render: only open DRM render node if necessary 
Only open a render node if we actually need one (ie, if we're about
to attempt GLES2 or Vulkan).
 2023-08-23 13:42:07 +02:00
Alexander Orzechowski
ce615a44c0 egl: Don't assume display is owned when KHR_display_reference is unsupported 
We could potentially leak a display here, but not really because the
display acts as a singleton that will be returned next time a renderer
of the same device is created.
 2023-08-21 15:51:26 +00:00
Alexander Orzechowski
91a1797a96 egl: Remove dead code 
Display is always NULL here since egl_init is always last to be called.
 2023-08-21 15:51:26 +00:00
Alexander Orzechowski
5f6912595e renderer/vulkan: Defer device lost signal until end of pass 
If the compositor were to try to handle a GPU reset within the lost
signal (by recreating the renderer) we should avoid referencing renderer
resources after the lost signal. This prevents use after free for such
compositors.
 2023-08-20 21:12:06 -04:00
Alexander Orzechowski
664ec59095 renderer: Sanity check texture source bounds 2023-08-14 08:08:39 +00:00
Simon Ser
c74f89d4f8 Avoid using memcpy() to copy structs 
We can just use a regular assignment instead. This is more
type-safe since there is no need to provide the struct size.

The remaining memcpy() calls perform array copies or copies from
void pointers (which may be unaligned).
 2023-08-03 14:40:28 +00:00
q234rty
061f5fafbd render/vulkan: use renamed glslang binary by default 
glslang 12.3.0 renamed glslangValidator to glslang,
use that by default and use the old name as a fallback.

References: https://github.com/KhronosGroup/glslang/blob/main/CHANGES.md?plain=1#L14
 2023-07-27 16:06:49 +08:00
Simon Ser
1205f03ec9 render/gles2: wrap timer setup in push_gles2_debug() 
With this, errors should be properly wrapped in the debug scope.
 2023-07-12 06:38:02 +00:00
Simon Ser
b7dca21c2b render: constify struct wlr_buffer_pass_options 
Let's not allow renderer implementations to mutate the passed in
options.
 2023-07-11 18:19:03 +00:00
Simon Ser
fe06e5f49a Use wl_container_of() instead of casts 
This slightly improves type safety.

The culprits were found with:

    git grep -E '\([a-z0-9_ ]+ \*\)\W?[a-z]'
 2023-07-11 20:16:17 +02:00
Simon Ser
c2c536de03 render/gles2: drop unnecessary cast 
We can just refer to the struct field here.
 2023-07-11 20:15:45 +02:00
Simon Ser
7a9f8d8d6b Use struct initializers instead of memset() 
This is a bit more type-safe.
 2023-07-07 17:31:11 +02:00
Alexander Orzechowski
38d451bcb5 render/vulkan: Don't compute texture.has_alpha until first... 
...texture view is dynamically created
 2023-06-21 11:37:54 -04:00
Alexander Orzechowski
06c0b0a204 render/vulkan: Initialize to fix compilation error 2023-06-19 18:00:26 -04:00
Simon Ser
be73da28b2 allocator: only use DRM auth if we are master 
Legacy DRM auth will only work if we are DRM master. Keep using an
unauthenticated DRM FD if we are not DRM master. This should be
enough for GBM.

Closes: https://gitlab.freedesktop.org/wlroots/wlroots/-/issues/3674
 2023-06-19 19:36:17 +00:00
Alexander Orzechowski
2044cc2311 render: Introduce wlr_render_texture_options.blend_mode 2023-06-19 13:16:34 -04:00
Alexander Orzechowski
693005ac99 pixman: Remove dead code 2023-06-19 12:44:57 -04:00
Alexander Orzechowski
6bd44c4fcd renderer: Introduce wlr_scale_filter_mode 2023-06-19 12:25:38 -04:00
Alexander Orzechowski
3ee0f52e09 render/vulkan: Dynamically create texture views 
Now that we are dynamically creating pipeline layouts, we need separate
texture views for each pipeline layout we choose to use with a texture.
 2023-06-17 21:21:35 -04:00
Alexander Orzechowski
7c5a3afd60 render/vulkan: Inline init_sampler 2023-06-17 21:21:35 -04:00
Alexander Orzechowski
8a387b5558 render/vulkan: Dynamically create pipeline layouts 
These will happen lazily when pipelines get created.
 2023-06-17 21:21:31 -04:00
Alexander Orzechowski
3623005858 render/vulkan/pipeline_key: Add blending 
This will become necessary when we switch away from scissoring. For the
time being, this cleans things up a bit and allows for a trivial
blending implementation for textures when that comes.
 2023-06-16 19:20:04 -04:00
Alexander Orzechowski
9d31372930 render/vulkan: Handle quad pipeline through generic pipeline path 2023-06-16 19:20:03 -04:00
Alexander Orzechowski
97fdd57eb2 render/vulkan: Dynamically handle pipeline creation for textures 
If we ever wanted to handle dynamic state that requires new pipelines
such as using different texture filters those can be added here with more
ease.
 2023-06-16 19:09:23 -04:00
Simon Ser
709c9dd287 render/vulkan: rename tex_usage to shm_tex_usage 
Same motivation as fdb199a43c ("render/vulkan: rename
tex_features to shm_tex_features").
 2023-06-12 12:02:22 +00:00
Simon Ser
30616bcf0c render/vulkan: reset scissor before post-blend subpass 
Otherwise only the last command's area will be copied over.
 2023-06-07 21:46:08 +02:00
Simon Ser
150a88bd03 render/vulkan: fix blend subpass matrix 
renderer->render_{width,height} are unused with the render pass
API.
 2023-06-07 21:30:35 +02:00
Simon Ser
fd9e4b860f render/vulkan: fix bound pipeline check for output_pipe 
renderer->bound_pipe is legacy, pass->bound_pipeline is used for
the render pass API code-path.

Closes: https://gitlab.freedesktop.org/wlroots/wlroots/-/issues/3657
 2023-06-07 20:46:33 +02:00
Simon Ser
1b947c08c6 render/vulkan: require format info for shm 
We use the format info to check the stride and need it to perform
the texture upload.
 2023-06-07 10:06:27 +00:00
Simon Ser
2a2f0772a9 render/vulkan: de-duplicate texture VkImageView init 
The logic is the same for both shm and DMA-BUF.
 2023-06-07 10:06:27 +00:00
Simon Ser
cebe991e95 render/vulkan: split off YCbCr texture features 
Avoids repeating the common bits between dma_tex_features and
dma_tex_ycbcr_features, and we will need just the YCbCr-related
flags for shm YCbCr support soon.
 2023-06-07 10:06:27 +00:00
Simon Ser
fdb199a43c render/vulkan: rename tex_features to shm_tex_features 
These features are required for shm only: the TRANSFER stuff is
for texture upload. We don't need these for DMA-BUFs. Make this
clearer by changing the name.

Also re-order the definitions to group all texture-related features
together.
 2023-06-07 10:06:27 +00:00
Alexander Orzechowski
398c6b66c6 render/gles2: Handle NULL timer 2023-06-06 02:17:10 -04:00
Alexander Orzechowski
e0424b24f6 renderer: Don't pass NULL options 2023-06-06 02:14:47 -04:00
Rose Hudson
45ca284eee render/gles2: implement timer API 2023-06-05 19:50:07 +00:00
Rose Hudson
9e8947e4d5 add render timer API 
Based on five calls:
wlr_render_timer_create - creates a timer which can be reused across
  frames on the same renderer
wlr_renderer_begin_buffer_pass - now takes a timer so that backends can
  record when the rendering starts and finishes
wlr_render_timer_get_time - should be called as late as possible so that
  queries can make their way back from the GPU
wlr_render_timer_destroy - self-explanatory

The timer is exposed as an opaque `struct wlr_render_timer` so that
backends can store whatever they want in there.
 2023-06-05 19:50:07 +00:00