fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2025-12-20 10:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gl-renderer: support XYUV8888 wl_shm format

Browse source 
This support is added so that the XYUV shader variant can be tested with
wl_shm from the test suite.

Libwayland version requirement is bumped to get WL_SHM_FORMAT_XYUV8888.
Libwayland is bumped to 1.18 too in the CI image. libwayland-dev package
is dropped, because we build wayland anyway.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen 2021-02-08 16:29:51 +02:00
parent 4b301fe7f2
commit 30104bd89a
4 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -20,7 +20,7 @@ stages:
variables: variables:
FDO_DISTRIBUTION_VERSION: buster FDO_DISTRIBUTION_VERSION: buster
FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/debian-install.sh' FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/debian-install.sh'
FDO_DISTRIBUTION_TAG: '2021-02-25.0' FDO_DISTRIBUTION_TAG: '2021-02-25.1'
container_prep: container_prep:

3
.gitlab-ci/debian-install.sh
View file

@ -70,7 +70,6 @@ apt-get -y --no-install-recommends install \
libva-dev \ libva-dev \
libvpx-dev \ libvpx-dev \
libvulkan-dev \ libvulkan-dev \
libwayland-dev \
libwebp-dev \ libwebp-dev \
libx11-dev \ libx11-dev \
libx11-xcb-dev \ libx11-xcb-dev \
@ -132,7 +131,7 @@ git checkout -b snapshot 69e3cb83b3405edc99fcf9611f50012a4f210f78
./setup.py install ./setup.py install
cd .. cd ..
git clone --branch 1.17.0 --depth=1 https://gitlab.freedesktop.org/wayland/wayland git clone --branch 1.18.0 --depth=1 https://gitlab.freedesktop.org/wayland/wayland
export MAKEFLAGS="-j4" export MAKEFLAGS="-j4"
cd wayland cd wayland
git show -s HEAD git show -s HEAD

12
libweston/renderer-gl/gl-renderer.c
View file

@ -2078,6 +2078,17 @@ gl_renderer_attach_shm(struct weston_surface *es, struct weston_buffer *buffer,
gl_format[1] = GL_BGRA_EXT; gl_format[1] = GL_BGRA_EXT;
es->is_opaque = true; es->is_opaque = true;
break; break;
case WL_SHM_FORMAT_XYUV8888:
/*
* [31:0] X:Y:Cb:Cr 8:8:8:8 little endian
* a:b: g: r in SHADER_VARIANT_XYUV
*/
gs->shader_requirements.variant = SHADER_VARIANT_XYUV;
pitch = wl_shm_buffer_get_stride(shm_buffer) / 4;
gl_format[0] = GL_RGBA;
gl_pixel_type = GL_UNSIGNED_BYTE;
es->is_opaque = true;
break;
default: default:
weston_log("warning: unknown shm buffer format: %08x\n", weston_log("warning: unknown shm buffer format: %08x\n",
wl_shm_buffer_get_format(shm_buffer)); wl_shm_buffer_get_format(shm_buffer));
@ -3674,6 +3685,7 @@ gl_renderer_display_create(struct weston_compositor *ec,
wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_YUV420); wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_YUV420);
wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_NV12); wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_NV12);
wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_YUYV); wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_YUYV);
wl_display_add_shm_format(ec->wl_display, WL_SHM_FORMAT_XYUV8888);
wl_signal_init(&gr->destroy_signal); wl_signal_init(&gr->destroy_signal);

4
meson.build
View file

@ -138,8 +138,8 @@ if dep_xkbcommon.version().version_compare('>= 0.5.0')
config_h.set('HAVE_XKBCOMMON_COMPOSE', '1') config_h.set('HAVE_XKBCOMMON_COMPOSE', '1')
endif endif
dep_wayland_server = dependency('wayland-server', version: '>= 1.17.0') dep_wayland_server = dependency('wayland-server', version: '>= 1.18.0')
dep_wayland_client = dependency('wayland-client', version: '>= 1.17.0') dep_wayland_client = dependency('wayland-client', version: '>= 1.18.0')
dep_pixman = dependency('pixman-1', version: '>= 0.25.2') dep_pixman = dependency('pixman-1', version: '>= 0.25.2')
dep_libinput = dependency('libinput', version: '>= 0.8.0') dep_libinput = dependency('libinput', version: '>= 0.8.0')
dep_libevdev = dependency('libevdev') dep_libevdev = dependency('libevdev')