fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-01-08 22:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gl-renderer: Check supported FBO formats

Browse source 
Validate the colour-renderable sized internal formats passed to
gl_fbo_init() using a new gl_fbo_is_format_supported() utility. Sized
internal formats are now required. More formats will progressively be
added depending on the OpenGL ES version and the supported extensions.

Support for RGBA8 FBOs is now required by the GL renderer.

Signed-off-by: Loïc Molinari <loic.molinari@collabora.com>
This commit is contained in:
Loïc Molinari 2024-08-16 16:52:11 +02:00 • committed by Daniel Stone
parent 1dc6868947
commit dc7299d69c
3 changed files with 109 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libweston/renderer-gl/gl-renderer-internal.h
View file

@ -488,7 +488,12 @@ gl_features_has(struct gl_renderer *gr,
}
bool
gl_fbo_init(GLenum internal_format,
gl_fbo_is_format_supported(struct gl_renderer *gr,
GLenum format);
bool
gl_fbo_init(struct gl_renderer *gr,
GLenum format,
int width,
int height,
GLuint *fb_out,

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

@ -765,7 +765,7 @@ gl_renderer_create_renderbuffer(struct weston_output *output,
return NULL;
}
if (!gl_fbo_init(format->gl_internalformat, go->fb_size.width,
if (!gl_fbo_init(gr, format->gl_internalformat, go->fb_size.width,
go->fb_size.height, &fb, &rb)) {
weston_log("Failed to init renderbuffer%s\n",
buffer ? " from buffer" : "");
@ -3761,7 +3761,6 @@ gl_renderer_surface_copy_content(struct weston_surface *surface,
.input_tex_filter = GL_NEAREST,
};
const pixman_format_code_t format = PIXMAN_a8b8g8r8;
const GLenum gl_format = GL_RGBA; /* PIXMAN_a8b8g8r8 little-endian */
struct gl_renderer *gr = get_renderer(surface->compositor);
struct gl_surface_state *gs;
struct gl_buffer_state *gb;
@ -3792,7 +3791,7 @@ gl_renderer_surface_copy_content(struct weston_surface *surface,
gl_shader_config_set_input_textures(&sconf, gs);
if (!gl_fbo_init(GL_RGBA, cw, ch, &fbo, &rb)) {
if (!gl_fbo_init(gr, GL_RGBA8, cw, ch, &fbo, &rb)) {
weston_log("Failed to init FBO\n");
goto fbo_init_error;
}
@ -3819,8 +3818,8 @@ gl_renderer_surface_copy_content(struct weston_surface *surface,
glDisableVertexAttribArray(SHADER_ATTRIB_LOC_TEXCOORD);
glDisableVertexAttribArray(SHADER_ATTRIB_LOC_POSITION);
glReadPixels(src_x, src_y, width, height, gl_format,
GL_UNSIGNED_BYTE, target);
glReadPixels(src_x, src_y, width, height, GL_RGBA, GL_UNSIGNED_BYTE,
target);
ret = 0;
use_program_error:
@ -4728,6 +4727,11 @@ gl_renderer_setup(struct weston_compositor *ec)
gl_extensions_add(extension_table, extensions, &gr->gl_extensions);
if (!gl_fbo_is_format_supported(gr, GL_RGBA8)) {
weston_log("GL_RGBA8 FBO format not available.\n");
return -1;
}
if (gl_extensions_has(gr, EXTENSION_OES_EGL_IMAGE)) {
GET_PROC_ADDRESS(gr->image_target_texture_2d,
"glEGLImageTargetTexture2DOES");

98
libweston/renderer-gl/gl-utils.c
View file

@ -107,11 +107,96 @@
* ⁵ External format and type combination(s).
*/
/* Initialise a pair of framebuffer and renderbuffer objects. The framebuffer
* object is left bound on success. Use gl_fbo_fini() to finalise.
/* Check whether gl_fbo_init() supports FBO creation for a given
* colour-renderable sized internal 'format' or not.
*/
bool
gl_fbo_init(GLenum internal_format,
gl_fbo_is_format_supported(struct gl_renderer *gr,
GLenum format)
{
switch (format) {
case GL_RGBA4:
case GL_RGB5_A1:
case GL_RGB565:
return true; /* From OpenGL ES 2.0 (Table 4.5 in spec). */
case GL_RGB8:
case GL_RGBA8:
return gr->gl_version >= gl_version(3, 0) ||
gl_extensions_has(gr, EXTENSION_OES_RGB8_RGBA8);
case GL_R8:
case GL_RG8:
case GL_SRGB8_ALPHA8:
case GL_R8I:
case GL_R8UI:
case GL_R16I:
case GL_R16UI:
case GL_R32I:
case GL_R32UI:
case GL_RG8I:
case GL_RG8UI:
case GL_RG16I:
case GL_RG16UI:
case GL_RG32I:
case GL_RG32UI:
case GL_RGBA8I:
case GL_RGBA8UI:
case GL_RGBA16I:
case GL_RGBA16UI:
case GL_RGBA32I:
case GL_RGBA32UI:
case GL_RGB10_A2:
case GL_RGB10_A2UI:
return gr->gl_version >= gl_version(3, 0);
case GL_R16F:
case GL_RG16F:
case GL_RGBA16F:
case GL_R32F:
case GL_RG32F:
case GL_RGBA32F:
case GL_R11F_G11F_B10F:
return gr->gl_version >= gl_version(3, 2);
case GL_R8_SNORM:
case GL_RG8_SNORM:
case GL_SRGB8:
case GL_RGB9_E5:
case GL_RGB16F:
case GL_RGB32F:
case GL_RGB8_SNORM:
case GL_RGB8I:
case GL_RGB8UI:
case GL_RGB16I:
case GL_RGB16UI:
case GL_RGB32I:
case GL_RGB32UI:
case GL_RGBA8_SNORM:
return false;
default:
unreachable("Unsupported sized internal format!");
return false;
}
}
/* Initialise a pair of framebuffer and renderbuffer objects. 'format' is a
* colour-renderable sized internal format listed in Table 1 above with the
* Renderable column filled. The framebuffer object is left bound on success.
* Use gl_fbo_fini() to finalise.
*
* OpenGL ES 2 notes:
*
* Implementations support at least these formats: GL_RGBA4, GL_RGB5_A1 and
* GL_RGB565. Additional formats are supported depending on extensions: GL_RGB8
* and GL_RGBA8.
*
* See gl_fbo_is_format_supported().
*/
bool
gl_fbo_init(struct gl_renderer *gr,
GLenum format,
int width,
int height,
GLuint *fb_out,
@ -120,11 +205,16 @@ gl_fbo_init(GLenum internal_format,
GLuint fb, rb;
GLenum status;
if (!gl_fbo_is_format_supported(gr, format)) {
weston_log("Error: FBO format not supported.\n");
return false;
}
glGenFramebuffers(1, &fb);
glBindFramebuffer(GL_FRAMEBUFFER, fb);
glGenRenderbuffers(1, &rb);
glBindRenderbuffer(GL_RENDERBUFFER, rb);
glRenderbufferStorage(GL_RENDERBUFFER, internal_format, width, height);
glRenderbufferStorage(GL_RENDERBUFFER, format, width, height);
glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
GL_RENDERBUFFER, rb);
status = glCheckFramebufferStatus(GL_FRAMEBUFFER);