fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 04:48:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

wsi/x11: Fix the is-visual-supported check

Browse source 
This was sort of well intentioned, but wrong. bits_per_rgb_value is the
number of significant bits in the color (channel) specification, not the
number of bits used to name that color within the pixel. If you have a
depth 24 visual but the colormap is 11 bits deep then each of those
channels selects one of 256 11-bit color values in the output ramp.

The open source drivers mostly don't expose anything like that, but
nvidia does, and we refuse to work. That's silly. Practically speaking
we can probably render to any TrueColor or DirectColor visual that your
X server exposes, since it is probably not going to have visuals for
non-color-renderable formats. Just check the visual class instead.

Likewise when matching formats to visuals, count the bits in the rgb
masks in the visual.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6995
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18381>
This commit is contained in:
Adam Jackson 2022-09-01 17:48:34 -04:00 • committed by Marge Bot
parent c23411a970
commit ed2e3f5871
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/vulkan/wsi/wsi_common_x11.c
View file

@ -539,7 +539,8 @@ visual_supported(xcb_visualtype_t *visual)
if (!visual)
return false;
return visual->bits_per_rgb_value == 8 || visual->bits_per_rgb_value == 10;
return visual->_class == XCB_VISUAL_CLASS_TRUE_COLOR ||
visual->_class == XCB_VISUAL_CLASS_DIRECT_COLOR;
}
VKAPI_ATTR VkBool32 VKAPI_CALL
@ -759,7 +760,9 @@ get_sorted_vk_formats(VkIcdSurfaceBase *surface, struct wsi_device *wsi_device,
*count = 0;
for (unsigned i = 0; i < ARRAY_SIZE(formats); i++) {
if (formats[i].bits_per_rgb == visual->bits_per_rgb_value)
if (formats[i].bits_per_rgb == util_bitcount(visual->red_mask) &&
formats[i].bits_per_rgb == util_bitcount(visual->green_mask) &&
formats[i].bits_per_rgb == util_bitcount(visual->blue_mask))
sorted_formats[(*count)++] = formats[i].format;
}