PolytreeDE/picom
1
0
Fork 0
mirror of https://github.com/yshui/picom.git synced 2024-11-03 04:33:49 -05:00
Code Releases Activity

backend: egl: remove references to the glx backend

Browse source
This commit is contained in:
Maxim Solovyov 2023-06-18 19:27:22 +03:00
parent dd85c3e175
commit 689321419b
No known key found for this signature in database
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/backend/gl/egl.c
View file

@ -67,7 +67,7 @@ const char *eglGetErrorString(EGLint error) {
} }
/** /**
* Free a glx_texture_t. * Free a gl_texture_t.
*/ */
static void egl_release_image(backend_t *base, struct gl_texture *tex) { static void egl_release_image(backend_t *base, struct gl_texture *tex) {
struct egl_data *gd = (void *)base; struct egl_data *gd = (void *)base;
@ -88,14 +88,14 @@ static void egl_release_image(backend_t *base, struct gl_texture *tex) {
} }
/** /**
* Destroy GLX related resources. * Destroy EGL related resources.
*/ */
void egl_deinit(backend_t *base) { void egl_deinit(backend_t *base) {
struct egl_data *gd = (void *)base; struct egl_data *gd = (void *)base;
gl_deinit(&gd->gl); gl_deinit(&gd->gl);
// Destroy GLX context // Destroy EGL context
if (gd->ctx != EGL_NO_CONTEXT) { if (gd->ctx != EGL_NO_CONTEXT) {
eglMakeCurrent(gd->display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); eglMakeCurrent(gd->display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
eglDestroyContext(gd->display, gd->ctx); eglDestroyContext(gd->display, gd->ctx);
@ -225,12 +225,12 @@ static backend_t *egl_init(session_t *ps) {
gd->ctx = eglCreateContext(gd->display, config, NULL, NULL); gd->ctx = eglCreateContext(gd->display, config, NULL, NULL);
if (gd->ctx == EGL_NO_CONTEXT) { if (gd->ctx == EGL_NO_CONTEXT) {
log_error("Failed to get GLX context."); log_error("Failed to get EGL context.");
goto end; goto end;
} }
if (!eglMakeCurrent(gd->display, gd->target_win, gd->target_win, gd->ctx)) { if (!eglMakeCurrent(gd->display, gd->target_win, gd->target_win, gd->ctx)) {
log_error("Failed to attach GLX context."); log_error("Failed to attach EGL context.");
goto end; goto end;
} }
@ -423,7 +423,7 @@ struct backend_operations egl_ops = {
PFNEGLGETDISPLAYDRIVERNAMEPROC eglGetDisplayDriverName; PFNEGLGETDISPLAYDRIVERNAMEPROC eglGetDisplayDriverName;
/** /**
* Check if a GLX extension exists. * Check if a EGL extension exists.
*/ */
static inline bool egl_has_extension(EGLDisplay dpy, const char *ext) { static inline bool egl_has_extension(EGLDisplay dpy, const char *ext) {
const char *egl_exts = eglQueryString(dpy, EGL_EXTENSIONS); const char *egl_exts = eglQueryString(dpy, EGL_EXTENSIONS);

4
src/backend/gl/egl.h
View file

@ -1,13 +1,11 @@
// SPDX-License-Identifier: MPL-2.0 // SPDX-License-Identifier: MPL-2.0
// Copyright (c) Yuxuan Shui <yshuiv7@gmail.com> // Copyright (c) Yuxuan Shui <yshuiv7@gmail.com>
#pragma once #pragma once
#include <stdbool.h>
// Older version of glx.h defines function prototypes for these extensions...
// Rename them to avoid conflicts
#include <EGL/egl.h> #include <EGL/egl.h>
#include <EGL/eglext.h> #include <EGL/eglext.h>
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glext.h> #include <GL/glext.h>
#include <stdbool.h>
#include <xcb/render.h> #include <xcb/render.h>
#include <xcb/xcb.h> #include <xcb/xcb.h>