mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-10 13:29:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

render/pixel_format: make wlr_pixel_format_info part of the public API

Browse source
This commit is contained in:
Simon Zeni 2021-09-10 14:23:22 -04:00
parent 4a4c8ca320
commit ae43cf93dd
16 changed files with 67 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

4
types/wlr_buffer.c
View file

@ -1,12 +1,12 @@
#include <assert.h>
#include <drm_fourcc.h>
#include <stdlib.h>
#include <wlr/render/pixel_format.h>
#include <wlr/render/wlr_renderer.h>
#include <wlr/types/wlr_buffer.h>
#include <wlr/types/wlr_drm.h>
#include <wlr/types/wlr_linux_dmabuf_v1.h>
#include <wlr/util/log.h>
#include "render/pixel_format.h"
#include "types/wlr_buffer.h"
#include "util/signal.h"
@ -427,7 +427,7 @@ static struct wlr_shm_client_buffer *shm_client_buffer_get_or_create(
buffer->shm_buffer = shm_buffer;
enum wl_shm_format wl_shm_format = wl_shm_buffer_get_format(shm_buffer);
buffer->format = convert_wl_shm_format_to_drm(wl_shm_format);
buffer->format = wlr_convert_wl_shm_format_to_drm(wl_shm_format);
buffer->stride = wl_shm_buffer_get_stride(shm_buffer);
buffer->resource_destroy.notify = shm_client_buffer_resource_handle_destroy;

6
types/wlr_screencopy_v1.c
View file

@ -6,11 +6,11 @@
#include <wlr/types/wlr_output.h>
#include <wlr/types/wlr_linux_dmabuf_v1.h>
#include <wlr/types/wlr_screencopy_v1.h>
#include <wlr/render/pixel_format.h>
#include <wlr/backend.h>
#include <wlr/util/box.h>
#include <wlr/util/log.h>
#include "wlr-screencopy-unstable-v1-protocol.h"
#include "render/pixel_format.h"
#include "util/signal.h"
#define SCREENCOPY_MANAGER_VERSION 3
@ -199,7 +199,7 @@ static bool frame_shm_copy(struct wlr_screencopy_frame_v1 *frame,
int y = frame->box.y;
enum wl_shm_format wl_shm_format = wl_shm_buffer_get_format(shm_buffer);
uint32_t drm_format = convert_wl_shm_format_to_drm(wl_shm_format);
uint32_t drm_format = wlr_convert_wl_shm_format_to_drm(wl_shm_format);
int32_t width = wl_shm_buffer_get_width(shm_buffer);
int32_t height = wl_shm_buffer_get_height(shm_buffer);
int32_t stride = wl_shm_buffer_get_stride(shm_buffer);
@ -555,7 +555,7 @@ static void capture_output(struct wl_client *wl_client,
goto error;
}
frame->format = convert_drm_format_to_wl_shm(drm_format);
frame->format = wlr_convert_drm_format_to_wl_shm(drm_format);
frame->fourcc = get_output_fourcc(output);
struct wlr_box buffer_box = {0};