fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-09 03:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

gl-renderer: Adapt gl_fbo_texture_init() to new texture utilities

Browse source 
Signed-off-by: Loïc Molinari <loic.molinari@collabora.com>
This commit is contained in:
Loïc Molinari 2024-10-16 08:26:26 +02:00 • committed by Daniel Stone
parent b3f6491b3a
commit 10f8b4ba81
3 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -608,11 +608,10 @@ gl_fbo_image_init(struct gl_renderer *gr,
GLuint *rb_out);
bool
gl_fbo_texture_init(GLenum internal_format,
gl_fbo_texture_init(struct gl_renderer *gr,
GLenum format,
int width,
int height,
GLenum format,
GLenum type,
GLuint *fb_out,
GLuint *tex_out);

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

@ -4024,8 +4024,8 @@ gl_renderer_resize_output(struct weston_output *output,
if (shadow_exists(go))
gl_fbo_texture_fini(&go->shadow_fb, &go->shadow_tex);
ret = gl_fbo_texture_init(shfmt->gl_format, area->width, area->height,
GL_RGBA, shfmt->gl_type, &go->shadow_fb,
ret = gl_fbo_texture_init(gr, shfmt->gl.internal, area->width,
area->height, &go->shadow_fb,
&go->shadow_tex);
return ret;

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

@ -1438,28 +1438,33 @@ gl_fbo_image_init(struct gl_renderer *gr,
}
/* Initialise a pair of framebuffer and texture objects to render into a
* texture. The framebuffer object is left bound on success. Use
* texture. '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 the framebuffer target and the texture object is left bound on
* the 2D texture target of the current texture unit on success. Use
* gl_fbo_texture_fini() to finalise.
*/
bool
gl_fbo_texture_init(GLenum internal_format,
gl_fbo_texture_init(struct gl_renderer *gr,
GLenum format,
int width,
int height,
GLenum format,
GLenum type,
GLuint *fb_out,
GLuint *tex_out)
{
GLenum status;
GLuint fb, tex;
/* XXX Port to new texture utilities and had sized BGRA8 support. */
if (!gl_fbo_is_format_supported(gr, format)) {
weston_log("Error: FBO format not supported.\n");
return false;
}
glGenTextures(1, &tex);
glBindTexture(GL_TEXTURE_2D, tex);
glTexImage2D(GL_TEXTURE_2D, 0, internal_format, width, height, 0,
format, type, NULL);
glBindTexture(GL_TEXTURE_2D, 0);
if (format == GL_BGRA8_EXT &&
!gl_features_has(gr, FEATURE_SIZED_BGRA8_RENDERBUFFER))
format = GL_BGRA_EXT;
texture_init(gr, GL_TEXTURE_2D, 1, format, width, height, 1, &tex);
glGenFramebuffers(1, &fb);
glBindFramebuffer(GL_FRAMEBUFFER, fb);
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,