mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-14 08:22:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 'master'

Browse source 
render: add gles3 renderer

See merge request wlroots/wlroots!5183
This commit is contained in:
William McKinnon 2025-12-29 07:16:21 +00:00
commit c0063a29d6
31 changed files with 499 additions and 334 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/meson.build
View file

@ -14,8 +14,8 @@ endif
if not features.get('xwayland')
exclude_files += 'xwayland.h'
endif
if not features.get('gles2-renderer')
exclude_files += ['render/egl.h', 'render/gles2.h']
if not features.get('gles2-renderer') and not features.get('gles3-renderer')
exclude_files += ['render/egl.h', 'render/gles.h']
endif
if not features.get('vulkan-renderer')
exclude_files += 'render/vulkan.h'

3
include/render/egl.h
View file

@ -47,6 +47,7 @@ struct wlr_egl {
bool has_modifiers;
struct wlr_drm_format_set dmabuf_texture_formats;
struct wlr_drm_format_set dmabuf_render_formats;
enum egl_version version;
};
struct wlr_egl_context {
@ -61,7 +62,7 @@ struct wlr_egl_context {
*
* Will attempt to load all possibly required API functions.
*/
struct wlr_egl *wlr_egl_create_with_drm_fd(int drm_fd);
struct wlr_egl *wlr_egl_create_with_drm_fd(int drm_fd, enum egl_version version);
/**
* Frees all related EGL resources, makes the context not-current and

80
include/render/gles2.h → include/render/gles.h
View file

@ -1,5 +1,5 @@
#ifndef RENDER_GLES2_H
#define RENDER_GLES2_H
#ifndef RENDER_GLES_H
#define RENDER_GLES_H
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
@ -7,7 +7,7 @@
#include <stdint.h>
#include <time.h>
#include <wlr/render/egl.h>
#include <wlr/render/gles2.h>
#include <wlr/render/gles.h>
#include <wlr/render/interface.h>
#include <wlr/render/wlr_renderer.h>
#include <wlr/render/wlr_texture.h>
@ -21,14 +21,14 @@
// https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23144
typedef void (GL_APIENTRYP PFNGLGETINTEGER64VEXTPROC) (GLenum pname, GLint64 *data);
struct wlr_gles2_pixel_format {
struct wlr_gles_pixel_format {
uint32_t drm_format;
// optional field, if empty then internalformat = format
GLint gl_internalformat;
GLint gl_format, gl_type;
};
struct wlr_gles2_tex_shader {
struct wlr_gles_tex_shader {
GLuint program;
GLint proj;
GLint tex_proj;
@ -37,7 +37,7 @@ struct wlr_gles2_tex_shader {
GLint pos_attrib;
};
struct wlr_gles2_renderer {
struct wlr_gles_renderer {
struct wlr_renderer wlr_renderer;
struct wlr_egl *egl;
@ -80,28 +80,28 @@ struct wlr_gles2_renderer {
GLint color;
GLint pos_attrib;
} quad;
struct wlr_gles2_tex_shader tex_rgba;
struct wlr_gles2_tex_shader tex_rgbx;
struct wlr_gles2_tex_shader tex_ext;
struct wlr_gles_tex_shader tex_rgba;
struct wlr_gles_tex_shader tex_rgbx;
struct wlr_gles_tex_shader tex_ext;
} shaders;
struct wl_list buffers; // wlr_gles2_buffer.link
struct wl_list textures; // wlr_gles2_texture.link
struct wl_list buffers; // wlr_gles_buffer.link
struct wl_list textures; // wlr_gles_texture.link
};
struct wlr_gles2_render_timer {
struct wlr_gles_render_timer {
struct wlr_render_timer base;
struct wlr_gles2_renderer *renderer;
struct wlr_gles_renderer *renderer;
struct timespec cpu_start;
struct timespec cpu_end;
GLuint id;
GLint64 gl_cpu_end;
};
struct wlr_gles2_buffer {
struct wlr_gles_buffer {
struct wlr_buffer *buffer;
struct wlr_gles2_renderer *renderer;
struct wl_list link; // wlr_gles2_renderer.buffers
struct wlr_gles_renderer *renderer;
struct wl_list link; // wlr_gles_renderer.buffers
bool external_only;
EGLImageKHR image;
@ -112,10 +112,10 @@ struct wlr_gles2_buffer {
struct wlr_addon addon;
};
struct wlr_gles2_texture {
struct wlr_gles_texture {
struct wlr_texture wlr_texture;
struct wlr_gles2_renderer *renderer;
struct wl_list link; // wlr_gles2_renderer.textures
struct wlr_gles_renderer *renderer;
struct wl_list link; // wlr_gles_renderer.textures
GLenum target;
@ -128,49 +128,49 @@ struct wlr_gles2_texture {
bool has_alpha;
uint32_t drm_format; // for mutable textures only, used to interpret upload data
struct wlr_gles2_buffer *buffer; // for DMA-BUF imports only
struct wlr_gles_buffer *buffer; // for DMA-BUF imports only
};
struct wlr_gles2_render_pass {
struct wlr_gles_render_pass {
struct wlr_render_pass base;
struct wlr_gles2_buffer *buffer;
struct wlr_gles_buffer *buffer;
float projection_matrix[9];
struct wlr_egl_context prev_ctx;
struct wlr_gles2_render_timer *timer;
struct wlr_gles_render_timer *timer;
struct wlr_drm_syncobj_timeline *signal_timeline;
uint64_t signal_point;
};
bool is_gles2_pixel_format_supported(const struct wlr_gles2_renderer *renderer,
const struct wlr_gles2_pixel_format *format);
const struct wlr_gles2_pixel_format *get_gles2_format_from_drm(uint32_t fmt);
const struct wlr_gles2_pixel_format *get_gles2_format_from_gl(
bool is_gles_pixel_format_supported(const struct wlr_gles_renderer *renderer,
const struct wlr_gles_pixel_format *format);
const struct wlr_gles_pixel_format *get_gles_format_from_drm(uint32_t fmt);
const struct wlr_gles_pixel_format *get_gles_format_from_gl(
GLint gl_format, GLint gl_type, bool alpha);
void get_gles2_shm_formats(const struct wlr_gles2_renderer *renderer,
void get_gles_shm_formats(const struct wlr_gles_renderer *renderer,
struct wlr_drm_format_set *out);
GLuint gles2_buffer_get_fbo(struct wlr_gles2_buffer *buffer);
GLuint gles_buffer_get_fbo(struct wlr_gles_buffer *buffer);
struct wlr_gles2_renderer *gles2_get_renderer(
struct wlr_gles_renderer *gles_get_renderer(
struct wlr_renderer *wlr_renderer);
struct wlr_gles2_render_timer *gles2_get_render_timer(
struct wlr_gles_render_timer *gles_get_render_timer(
struct wlr_render_timer *timer);
struct wlr_gles2_texture *gles2_get_texture(
struct wlr_gles_texture *gles_get_texture(
struct wlr_texture *wlr_texture);
struct wlr_gles2_buffer *gles2_buffer_get_or_create(struct wlr_gles2_renderer *renderer,
struct wlr_gles_buffer *gles_buffer_get_or_create(struct wlr_gles_renderer *renderer,
struct wlr_buffer *wlr_buffer);
struct wlr_texture *gles2_texture_from_buffer(struct wlr_renderer *wlr_renderer,
struct wlr_texture *gles_texture_from_buffer(struct wlr_renderer *wlr_renderer,
struct wlr_buffer *buffer);
void gles2_texture_destroy(struct wlr_gles2_texture *texture);
void gles_texture_destroy(struct wlr_gles_texture *texture);
void push_gles2_debug_(struct wlr_gles2_renderer *renderer,
void push_gles_debug_(struct wlr_gles_renderer *renderer,
const char *file, const char *func);
#define push_gles2_debug(renderer) push_gles2_debug_(renderer, _WLR_FILENAME, __func__)
void pop_gles2_debug(struct wlr_gles2_renderer *renderer);
#define push_gles_debug(renderer) push_gles_debug_(renderer, _WLR_FILENAME, __func__)
void pop_gles_debug(struct wlr_gles_renderer *renderer);
struct wlr_gles2_render_pass *begin_gles2_buffer_pass(struct wlr_gles2_buffer *buffer,
struct wlr_egl_context *prev_ctx, struct wlr_gles2_render_timer *timer,
struct wlr_gles_render_pass *begin_gles_buffer_pass(struct wlr_gles_buffer *buffer,
struct wlr_egl_context *prev_ctx, struct wlr_gles_render_timer *timer,
struct wlr_drm_syncobj_timeline *signal_timeline, uint64_t signal_point);
#endif

9
include/wlr/config.h.in
View file

@ -27,9 +27,16 @@
* Whether the GLES2 renderer is compile-time enabled. Equivalent to the
* pkg-config "have_gles2_renderer" variable.
*
* Required for <wlr/render/gles2.h>.
* Required for <wlr/render/gles.h>.
*/
#mesondefine WLR_HAS_GLES2_RENDERER
/**
* Whether the GLES3 renderer is compile-time enabled. Equivalent to the
* pkg-config "have_gles3_renderer" variable.
*
* Required for <wlr/render/gles.h>.
*/
#mesondefine WLR_HAS_GLES3_RENDERER
/**
* Whether the Vulkan renderer is compile-time enabled. Equivalent to the
* pkg-config "have_vulkan_renderer" variable.

4
include/wlr/render/egl.h
View file

@ -28,6 +28,8 @@
struct wlr_egl;
enum egl_version { GLES2 = 2, GLES3 = 3 };
/**
* Create a struct wlr_egl with an existing EGL display and context.
*
@ -35,7 +37,7 @@ struct wlr_egl;
* initialization.
*/
struct wlr_egl *wlr_egl_create_with_context(EGLDisplay display,
EGLContext context);
EGLContext context, enum egl_version version);
/**
* Get the EGL display used by the struct wlr_egl.

54
include/wlr/render/gles.h Normal file
View file

@ -0,0 +1,54 @@
/*
* This an unstable interface of wlroots. No guarantees are made regarding the
* future consistency of this API.
*/
#ifndef WLR_USE_UNSTABLE
#error "Add -DWLR_USE_UNSTABLE to enable unstable wlroots features"
#endif
#ifndef WLR_RENDER_GLES2_H
#define WLR_RENDER_GLES2_H
#include <GLES2/gl2.h>
#include <wlr/render/wlr_renderer.h>
struct wlr_egl;
enum egl_version;
/**
* OpenGL ES renderer.
*
* Care must be taken to avoid stepping each other's toes with EGL contexts:
* the current EGL is global state. The GLES renderer operations will save
* and restore any previous EGL context when called. A render pass is seen as
* a single operation.
*
* The GLES renderer doesn't support arbitrarily nested render passes. It
* supports a subset only: after a nested render pass is created, any parent
* render pass can't be used before the nested render pass is submitted.
*/
struct wlr_renderer *wlr_gles_renderer_create_with_drm_fd(int drm_fd,
enum egl_version version);
struct wlr_renderer *wlr_gles_renderer_create(struct wlr_egl *egl);
struct wlr_egl *wlr_gles_renderer_get_egl(struct wlr_renderer *renderer);
bool wlr_gles_renderer_check_ext(struct wlr_renderer *renderer, const char *ext);
GLuint wlr_gles_renderer_get_buffer_fbo(struct wlr_renderer *renderer, struct wlr_buffer *buffer);
struct wlr_gles_texture_attribs {
GLenum target; /* either GL_TEXTURE_2D or GL_TEXTURE_EXTERNAL_OES */
GLuint tex;
bool has_alpha;
};
bool wlr_renderer_is_gles(struct wlr_renderer *wlr_renderer);
bool wlr_render_timer_is_gles(struct wlr_render_timer *timer);
bool wlr_texture_is_gles(struct wlr_texture *texture);
void wlr_gles_texture_get_attribs(struct wlr_texture *texture,
struct wlr_gles_texture_attribs *attribs);
#endif

51
include/wlr/render/gles2.h
View file

@ -1,51 +0,0 @@
/*
* This an unstable interface of wlroots. No guarantees are made regarding the
* future consistency of this API.
*/
#ifndef WLR_USE_UNSTABLE
#error "Add -DWLR_USE_UNSTABLE to enable unstable wlroots features"
#endif
#ifndef WLR_RENDER_GLES2_H
#define WLR_RENDER_GLES2_H
#include <GLES2/gl2.h>
#include <wlr/render/wlr_renderer.h>
struct wlr_egl;
/**
* OpenGL ES 2 renderer.
*
* Care must be taken to avoid stepping each other's toes with EGL contexts:
* the current EGL is global state. The GLES2 renderer operations will save
* and restore any previous EGL context when called. A render pass is seen as
* a single operation.
*
* The GLES2 renderer doesn't support arbitrarily nested render passes. It
* supports a subset only: after a nested render pass is created, any parent
* render pass can't be used before the nested render pass is submitted.
*/
struct wlr_renderer *wlr_gles2_renderer_create_with_drm_fd(int drm_fd);
struct wlr_renderer *wlr_gles2_renderer_create(struct wlr_egl *egl);
struct wlr_egl *wlr_gles2_renderer_get_egl(struct wlr_renderer *renderer);
bool wlr_gles2_renderer_check_ext(struct wlr_renderer *renderer, const char *ext);
GLuint wlr_gles2_renderer_get_buffer_fbo(struct wlr_renderer *renderer, struct wlr_buffer *buffer);
struct wlr_gles2_texture_attribs {
GLenum target; /* either GL_TEXTURE_2D or GL_TEXTURE_EXTERNAL_OES */
GLuint tex;
bool has_alpha;
};
bool wlr_renderer_is_gles2(struct wlr_renderer *wlr_renderer);
bool wlr_render_timer_is_gles2(struct wlr_render_timer *timer);
bool wlr_texture_is_gles2(struct wlr_texture *texture);
void wlr_gles2_texture_get_attribs(struct wlr_texture *texture,
struct wlr_gles2_texture_attribs *attribs);
#endif