Refactor EGL/GL API loading

Remove glapi.sh code generation, replace it with hand-written loading code that checks extension strings before calling eglGetProcAddress. The GLES2 renderer still uses global state because of: - {PUSH,POP}_GLES2_DEBUG macros - wlr_gles2_texture_from_* taking a wlr_egl instead of the renderer
swaywm · Dec 20, 2019 · 515679e · 515679e
1 parent 7745486
commit 515679e
Show file tree

Hide file tree

Showing 11 changed files with 191 additions and 245 deletions.
diff --git a/backend/drm/renderer.c b/backend/drm/renderer.c
@@ -11,7 +11,6 @@
 #include <wlr/types/wlr_matrix.h>
 #include <wlr/util/log.h>
 #include "backend/drm/drm.h"
-#include "glapi.h"
 
 bool init_drm_renderer(struct wlr_drm_backend *drm,
 		struct wlr_drm_renderer *renderer, wlr_renderer_create_func_t create_renderer_func) {

diff --git a/backend/headless/backend.c b/backend/headless/backend.c
@@ -6,7 +6,6 @@
 #include <wlr/render/gles2.h>
 #include <wlr/util/log.h>
 #include "backend/headless.h"
-#include "glapi.h"
 #include "util/signal.h"
 
 struct wlr_headless_backend *headless_backend_from_backend(

diff --git a/backend/rdp/backend.c b/backend/rdp/backend.c
@@ -6,7 +6,6 @@
 #include <wlr/render/gles2.h>
 #include <wlr/util/log.h>
 #include "backend/rdp.h"
-#include "glapi.h"
 #include "util/signal.h"
 
 struct wlr_rdp_backend *rdp_backend_from_backend(

diff --git a/glgen.sh b/glgen.sh
diff --git a/include/render/gles2.h b/include/render/gles2.h
@@ -14,6 +14,16 @@
 #include <wlr/render/wlr_texture.h>
 #include <wlr/util/log.h>
 
+struct wlr_gles2_procs {
+	PFNGLEGLIMAGETARGETTEXTURE2DOESPROC glEGLImageTargetTexture2DOES;
+	PFNGLDEBUGMESSAGECALLBACKKHRPROC glDebugMessageCallbackKHR;
+	PFNGLDEBUGMESSAGECONTROLKHRPROC glDebugMessageControlKHR;
+	PFNGLPOPDEBUGGROUPKHRPROC glPopDebugGroupKHR;
+	PFNGLPUSHDEBUGGROUPKHRPROC glPushDebugGroupKHR;
+};
+
+extern struct wlr_gles2_procs gles2_procs;
+
 struct wlr_gles2_pixel_format {
 	enum wl_shm_format wl_format;
 	GLint gl_format, gl_type;
@@ -33,7 +43,6 @@ struct wlr_gles2_renderer {
 	struct wlr_renderer wlr_renderer;
 
 	struct wlr_egl *egl;
-	const char *exts_str;
 
 	struct {
 		bool read_format_bgra_ext;

diff --git a/include/wlr/render/egl.h b/include/wlr/render/egl.h
@@ -22,6 +22,8 @@
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
+// TODO: remove eglmesaext.h
+#include <EGL/eglmesaext.h>
 #include <pixman.h>
 #include <stdbool.h>
 #include <wayland-server-core.h>
@@ -34,19 +36,32 @@ struct wlr_egl {
 	EGLConfig config;
 	EGLContext context;
 
-	const char *exts_str;
-
 	struct {
 		bool bind_wayland_display_wl;
 		bool buffer_age_ext;
 		bool image_base_khr;
 		bool image_dma_buf_export_mesa;
 		bool image_dmabuf_import_ext;
 		bool image_dmabuf_import_modifiers_ext;
-		bool swap_buffers_with_damage_ext;
-		bool swap_buffers_with_damage_khr;
+		bool swap_buffers_with_damage;
 	} exts;
 
+	struct {
+		PFNEGLGETPLATFORMDISPLAYEXTPROC eglGetPlatformDisplayEXT;
+		PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC eglCreatePlatformWindowSurfaceEXT;
+		PFNEGLCREATEIMAGEKHRPROC eglCreateImageKHR;
+		PFNEGLDESTROYIMAGEKHRPROC eglDestroyImageKHR;
+		PFNEGLQUERYWAYLANDBUFFERWL eglQueryWaylandBufferWL;
+		PFNEGLBINDWAYLANDDISPLAYWL eglBindWaylandDisplayWL;
+		PFNEGLUNBINDWAYLANDDISPLAYWL eglUnbindWaylandDisplayWL;
+		PFNEGLSWAPBUFFERSWITHDAMAGEEXTPROC eglSwapBuffersWithDamage; // KHR or EXT
+		PFNEGLQUERYDMABUFFORMATSEXTPROC eglQueryDmaBufFormatsEXT;
+		PFNEGLQUERYDMABUFMODIFIERSEXTPROC eglQueryDmaBufModifiersEXT;
+		PFNEGLEXPORTDMABUFIMAGEQUERYMESAPROC eglExportDMABUFImageQueryMESA;
+		PFNEGLEXPORTDMABUFIMAGEMESAPROC eglExportDMABUFImageMESA;
+		PFNEGLDEBUGMESSAGECONTROLKHRPROC eglDebugMessageControlKHR;
+	} procs;
+
 	struct wl_display *wl_display;
 
 	struct wlr_drm_format_set dmabuf_formats;