blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "render/egl: remove unused gbm_device member" 

This reverts commit 306cf11d87.
This commit is contained in:
Simon Ser 2021-01-20 21:20:55 +01:00
parent 306cf11d87
commit 54e5ef39c0
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/wlr/render/egl.h
View File

@ -41,6 +41,7 @@ struct wlr_egl {
EGLConfig config; // may be EGL_NO_CONFIG EGLConfig config; // may be EGL_NO_CONFIG
EGLContext context; EGLContext context;
EGLDeviceEXT device; // may be EGL_NO_DEVICE_EXT EGLDeviceEXT device; // may be EGL_NO_DEVICE_EXT
struct gbm_device *gbm_device;
struct { struct {
// Display extensions // Display extensions

5
render/egl.c
View File

@ -5,6 +5,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <gbm.h>
#include <wlr/render/egl.h> #include <wlr/render/egl.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include <wlr/util/region.h> #include <wlr/util/region.h>
@ -487,6 +488,10 @@ void wlr_egl_destroy(struct wlr_egl *egl) {
eglTerminate(egl->display); eglTerminate(egl->display);
eglReleaseThread(); eglReleaseThread();
if (egl->gbm_device) {
gbm_device_destroy(egl->gbm_device);
}
free(egl); free(egl);
} }

1
render/wlr_renderer.c
View File

@ -1,6 +1,7 @@
#include <assert.h> #include <assert.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdlib.h> #include <stdlib.h>
#include <gbm.h>
#include <wlr/render/egl.h> #include <wlr/render/egl.h>
#include <wlr/render/gles2.h> #include <wlr/render/gles2.h>
#include <wlr/render/interface.h> #include <wlr/render/interface.h>