BitHeaven
/
picom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Call glxext_init from glx_init 

Make sure we query the extensions.

Also don't start glx string marker logger for new backends yet.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
This commit is contained in:
Yuxuan Shui 2019-02-21 23:25:31 +00:00
parent 23ee4c6cbe
commit 9cce1efe3f
No known key found for this signature in database
GPG Key ID: 37C999F617EA1A47
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/backend/gl/glx.c
View File

@ -233,6 +233,7 @@ static void glx_deinit(void *backend_data, session_t *ps) {
*/ */
static void *glx_init(session_t *ps) { static void *glx_init(session_t *ps) {
bool success = false; bool success = false;
glxext_init(ps->dpy, ps->scr);
auto gd = ccalloc(1, struct _glx_data); auto gd = ccalloc(1, struct _glx_data);
XVisualInfo *pvis = NULL; XVisualInfo *pvis = NULL;
@ -264,8 +265,10 @@ static void *glx_init(session_t *ps) {
} }
// Ensure GLX_EXT_texture_from_pixmap exists // Ensure GLX_EXT_texture_from_pixmap exists
if (!glxext.has_GLX_EXT_texture_from_pixmap) if (!glxext.has_GLX_EXT_texture_from_pixmap) {
log_error("GLX_EXT_texture_from_pixmap is not supported by your driver");
goto end; goto end;
}
// Initialize GLX data structure // Initialize GLX data structure
for (int i = 0; i < MAX_BLUR_PASS; ++i) { for (int i = 0; i < MAX_BLUR_PASS; ++i) {

2
src/compton.c
View File

@ -2662,7 +2662,7 @@ session_init(int argc, char **argv, Display *dpy, const char *config_file,
} }
free(config_file_to_free); free(config_file_to_free);
if (bkend_use_glx(ps)) { if (bkend_use_glx(ps) && !ps->o.experimental_backends) {
auto glx_logger = glx_string_marker_logger_new(); auto glx_logger = glx_string_marker_logger_new();
if (glx_logger) { if (glx_logger) {
log_info("Enabling gl string marker"); log_info("Enabling gl string marker");