mirror of
				https://gitlab.freedesktop.org/wlroots/wlroots.git
				synced 2025-11-03 09:01:40 -05:00 
			
		
		
		
	commit44e8451cd9("render/gles2: hide shm formats without GL support") added the is_gles2_pixel_format_supported() function to render/gles2/pixel_format.c, whose stated purpose is to "check whether the renderer has the needed GL extensions to read a given pixel format." It then used that function to filter the pixel formats returned by get_gles2_shm_formats(). The result of this change is that RGB formats are no longer reported for GL drivers that don't implement EXT_read_format_bgra, even when those formats are supported for rendering (which they have to be for wlr_gles2_renderer_create() to succeed). This is a pretty clear regression, since wlr_renderer_init_wl_shm() fails when either of WL_SHM_FORMAT_ARGB8888 or WL_SHM_FORMAT_XRGB8888 are missing. To fix the regression, change is_gles2_pixel_format_supported() to accept all pixel formats that support rendering, regardless of whether we can read them or not, and move the check for EXT_read_format_bgra back into gles2_read_pixels(). (There's already a check for this extension in gles2_preferred_read_format(), so we're not breaking any abstraction that wasn't already broken.) Tested on the NVIDIA 495.46 proprietary driver, which doesn't support EXT_read_format_bgra. Fixes:44e8451cd9("render/gles2: hide shm formats without GL support")
		
			
				
	
	
		
			157 lines
		
	
	
	
		
			3.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			157 lines
		
	
	
	
		
			3.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
#include <drm_fourcc.h>
 | 
						|
#include <GLES2/gl2.h>
 | 
						|
#include <GLES2/gl2ext.h>
 | 
						|
#include "render/gles2.h"
 | 
						|
 | 
						|
/*
 | 
						|
 * The DRM formats are little endian while the GL formats are big endian,
 | 
						|
 * so DRM_FORMAT_ARGB8888 is actually compatible with GL_BGRA_EXT.
 | 
						|
 */
 | 
						|
static const struct wlr_gles2_pixel_format formats[] = {
 | 
						|
	{
 | 
						|
		.drm_format = DRM_FORMAT_ARGB8888,
 | 
						|
		.gl_format = GL_BGRA_EXT,
 | 
						|
		.gl_type = GL_UNSIGNED_BYTE,
 | 
						|
		.has_alpha = true,
 | 
						|
	},
 | 
						|
	{
 | 
						|
		.drm_format = DRM_FORMAT_XRGB8888,
 | 
						|
		.gl_format = GL_BGRA_EXT,
 | 
						|
		.gl_type = GL_UNSIGNED_BYTE,
 | 
						|
		.has_alpha = false,
 | 
						|
	},
 | 
						|
	{
 | 
						|
		.drm_format = DRM_FORMAT_XBGR8888,
 | 
						|
		.gl_format = GL_RGBA,
 | 
						|
		.gl_type = GL_UNSIGNED_BYTE,
 | 
						|
		.has_alpha = false,
 | 
						|
	},
 | 
						|
	{
 | 
						|
		.drm_format = DRM_FORMAT_ABGR8888,
 | 
						|
		.gl_format = GL_RGBA,
 | 
						|
		.gl_type = GL_UNSIGNED_BYTE,
 | 
						|
		.has_alpha = true,
 | 
						|
	},
 | 
						|
	{
 | 
						|
		.drm_format = DRM_FORMAT_BGR888,
 | 
						|
		.gl_format = GL_RGB,
 | 
						|
		.gl_type = GL_UNSIGNED_BYTE,
 | 
						|
		.has_alpha = false,
 | 
						|
	},
 | 
						|
#if WLR_LITTLE_ENDIAN
 | 
						|
	{
 | 
						|
		.drm_format = DRM_FORMAT_RGBX4444,
 | 
						|
		.gl_format = GL_RGBA,
 | 
						|
		.gl_type = GL_UNSIGNED_SHORT_4_4_4_4,
 | 
						|
		.has_alpha = false,
 | 
						|
	},
 | 
						|
	{
 | 
						|
		.drm_format = DRM_FORMAT_RGBA4444,
 | 
						|
		.gl_format = GL_RGBA,
 | 
						|
		.gl_type = GL_UNSIGNED_SHORT_4_4_4_4,
 | 
						|
		.has_alpha = true,
 | 
						|
	},
 | 
						|
	{
 | 
						|
		.drm_format = DRM_FORMAT_RGBX5551,
 | 
						|
		.gl_format = GL_RGBA,
 | 
						|
		.gl_type = GL_UNSIGNED_SHORT_5_5_5_1,
 | 
						|
		.has_alpha = false,
 | 
						|
	},
 | 
						|
	{
 | 
						|
		.drm_format = DRM_FORMAT_RGBA5551,
 | 
						|
		.gl_format = GL_RGBA,
 | 
						|
		.gl_type = GL_UNSIGNED_SHORT_5_5_5_1,
 | 
						|
		.has_alpha = true,
 | 
						|
	},
 | 
						|
	{
 | 
						|
		.drm_format = DRM_FORMAT_RGB565,
 | 
						|
		.gl_format = GL_RGB,
 | 
						|
		.gl_type = GL_UNSIGNED_SHORT_5_6_5,
 | 
						|
		.has_alpha = false,
 | 
						|
	},
 | 
						|
	{
 | 
						|
		.drm_format = DRM_FORMAT_XBGR2101010,
 | 
						|
		.gl_format = GL_RGBA,
 | 
						|
		.gl_type = GL_UNSIGNED_INT_2_10_10_10_REV_EXT,
 | 
						|
		.has_alpha = false,
 | 
						|
	},
 | 
						|
	{
 | 
						|
		.drm_format = DRM_FORMAT_ABGR2101010,
 | 
						|
		.gl_format = GL_RGBA,
 | 
						|
		.gl_type = GL_UNSIGNED_INT_2_10_10_10_REV_EXT,
 | 
						|
		.has_alpha = true,
 | 
						|
	},
 | 
						|
	{
 | 
						|
		.drm_format = DRM_FORMAT_XBGR16161616F,
 | 
						|
		.gl_format = GL_RGBA,
 | 
						|
		.gl_type = GL_HALF_FLOAT_OES,
 | 
						|
		.has_alpha = false,
 | 
						|
	},
 | 
						|
	{
 | 
						|
		.drm_format = DRM_FORMAT_ABGR16161616F,
 | 
						|
		.gl_format = GL_RGBA,
 | 
						|
		.gl_type = GL_HALF_FLOAT_OES,
 | 
						|
		.has_alpha = true,
 | 
						|
	},
 | 
						|
#endif
 | 
						|
};
 | 
						|
 | 
						|
// TODO: more pixel formats
 | 
						|
 | 
						|
/*
 | 
						|
 * Return true if supported for texturing, even if other operations like
 | 
						|
 * reading aren't supported.
 | 
						|
 */
 | 
						|
bool is_gles2_pixel_format_supported(const struct wlr_gles2_renderer *renderer,
 | 
						|
		const struct wlr_gles2_pixel_format *format) {
 | 
						|
	if (format->gl_type == GL_UNSIGNED_INT_2_10_10_10_REV_EXT
 | 
						|
			&& !renderer->exts.EXT_texture_type_2_10_10_10_REV) {
 | 
						|
		return false;
 | 
						|
	}
 | 
						|
	if (format->gl_type == GL_HALF_FLOAT_OES
 | 
						|
			&& !renderer->exts.OES_texture_half_float_linear) {
 | 
						|
		return false;
 | 
						|
	}
 | 
						|
	/*
 | 
						|
	 * Note that we don't need to check for GL_EXT_texture_format_BGRA8888
 | 
						|
	 * here, since we've already checked if we have it at renderer creation
 | 
						|
	 * time and bailed out if not. We do the check there because Wayland
 | 
						|
	 * requires all compositors to support SHM buffers in that format.
 | 
						|
	 */
 | 
						|
	return true;
 | 
						|
}
 | 
						|
 | 
						|
const struct wlr_gles2_pixel_format *get_gles2_format_from_drm(uint32_t fmt) {
 | 
						|
	for (size_t i = 0; i < sizeof(formats) / sizeof(*formats); ++i) {
 | 
						|
		if (formats[i].drm_format == fmt) {
 | 
						|
			return &formats[i];
 | 
						|
		}
 | 
						|
	}
 | 
						|
	return NULL;
 | 
						|
}
 | 
						|
 | 
						|
const struct wlr_gles2_pixel_format *get_gles2_format_from_gl(
 | 
						|
		GLint gl_format, GLint gl_type, bool alpha) {
 | 
						|
	for (size_t i = 0; i < sizeof(formats) / sizeof(*formats); ++i) {
 | 
						|
		if (formats[i].gl_format == gl_format &&
 | 
						|
				formats[i].gl_type == gl_type &&
 | 
						|
				formats[i].has_alpha == alpha) {
 | 
						|
			return &formats[i];
 | 
						|
		}
 | 
						|
	}
 | 
						|
	return NULL;
 | 
						|
}
 | 
						|
 | 
						|
const uint32_t *get_gles2_shm_formats(const struct wlr_gles2_renderer *renderer,
 | 
						|
		size_t *len) {
 | 
						|
	static uint32_t shm_formats[sizeof(formats) / sizeof(formats[0])];
 | 
						|
	size_t j = 0;
 | 
						|
	for (size_t i = 0; i < sizeof(formats) / sizeof(formats[0]); i++) {
 | 
						|
		if (!is_gles2_pixel_format_supported(renderer, &formats[i])) {
 | 
						|
			continue;
 | 
						|
		}
 | 
						|
		shm_formats[j++] = formats[i].drm_format;
 | 
						|
	}
 | 
						|
	*len = j;
 | 
						|
	return shm_formats;
 | 
						|
}
 |