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

Update wlroots to 0.13.0

Browse source 
Update usage of wlr_headless_backend_create,
wlr_renderer_get_shm_texture_formats,
wlr_texture_from_pixels and add missing include for render/egl.h.
This commit is contained in:
Sefa Eyeoglu 2021-01-07 12:07:28 +01:00 • committed by Simon Ser
parent c834999a5f
commit ed44909813
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/rendervulkan.cpp
View file

@ -2173,14 +2173,14 @@ static void renderer_render_ellipse_with_matrix( struct wlr_renderer *renderer,
abort(); // unreachable
}
static const enum wl_shm_format *renderer_get_shm_texture_formats( struct wlr_renderer *wlr_renderer, size_t *len
static const uint32_t *renderer_get_shm_texture_formats( struct wlr_renderer *wlr_renderer, size_t *len
)
{
VulkanRenderer_t *renderer = (VulkanRenderer_t *) wlr_renderer;
return wlr_renderer_get_shm_texture_formats( renderer->parent, len );
}
static struct wlr_texture *renderer_texture_from_pixels( struct wlr_renderer *wlr_renderer, enum wl_shm_format shmFormat, uint32_t stride, uint32_t width, uint32_t height, const void *src )
static struct wlr_texture *renderer_texture_from_pixels( struct wlr_renderer *wlr_renderer, uint32_t shmFormat, uint32_t stride, uint32_t width, uint32_t height, const void *src )
{
VulkanRenderer_t *renderer = (VulkanRenderer_t *) wlr_renderer;
return wlr_texture_from_pixels( renderer->parent, shmFormat, stride, width, height, src );

1
src/rendervulkan.hpp
View file

@ -54,6 +54,7 @@ extern "C" {
#include <wlr/render/dmabuf.h>
#include <wlr/render/gles2.h>
#include <wlr/render/interface.h>
#include <wlr/render/egl.h>
#undef static
}

2
src/wlserver.cpp
View file

@ -456,7 +456,7 @@ int wlserver_init(int argc, char **argv, bool bIsNested) {
wl_signal_add( &wlserver.wlr.multi_backend->events.new_input, &new_input_listener );
wlserver.wlr.headless_backend = wlr_headless_backend_create( wlserver.wl_display, NULL );
wlserver.wlr.headless_backend = wlr_headless_backend_create( wlserver.wl_display );
if ( wlserver.wlr.headless_backend == NULL )
{
return 1;

2
subprojects/wlroots

@ -1 +1 @@
Subproject commit da2a2169344ef2dbe0dc31fd013caf30880d6aff
Subproject commit 69c71dbc8afecc5da5c800cdc1475185064b4ac4