diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-10-21 22:03:29 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2017-10-21 22:03:48 -0400 |
| commit | 16f35ecbeacd685e7d9905a7867d8c950e369f2e (patch) | |
| tree | c9cd07e837b454ff227fde4d7511a98c805bca27 /render/gles2 | |
| parent | 169b68b17c668fc6d3feec92f3cf72308ba4e99c (diff) | |
| parent | d4e311a1adeee7cfd2a4404d716f3e0237ead607 (diff) | |
Merge branch 'master' into heghe/wl_list
Diffstat (limited to 'render/gles2')
| -rw-r--r-- | render/gles2/renderer.c | 9 | ||||
| -rw-r--r-- | render/gles2/texture.c | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c index 94c50b9a..646d69ec 100644 --- a/render/gles2/renderer.c +++ b/render/gles2/renderer.c @@ -5,9 +5,9 @@ #include <GLES2/gl2ext.h> #include <wayland-util.h> #include <wayland-server-protocol.h> -#include <wlr/egl.h> #include <wlr/backend.h> #include <wlr/render.h> +#include <wlr/render/egl.h> #include <wlr/render/interface.h> #include <wlr/render/matrix.h> #include <wlr/util/log.h> @@ -246,9 +246,8 @@ struct wlr_renderer *wlr_gles2_renderer_create(struct wlr_backend *backend) { return NULL; } wlr_renderer_init(&renderer->wlr_renderer, &wlr_renderer_impl); - if (backend) { - struct wlr_egl *egl = wlr_backend_get_egl(backend); - renderer->egl = egl; - } + + renderer->egl = wlr_backend_get_egl(backend); + return &renderer->wlr_renderer; } diff --git a/render/gles2/texture.c b/render/gles2/texture.c index 5e934aa4..ff71cb08 100644 --- a/render/gles2/texture.c +++ b/render/gles2/texture.c @@ -5,8 +5,8 @@ #include <GLES2/gl2ext.h> #include <wayland-util.h> #include <wayland-server-protocol.h> -#include <wlr/egl.h> #include <wlr/render.h> +#include <wlr/render/egl.h> #include <wlr/render/interface.h> #include <wlr/render/matrix.h> #include <wlr/util/log.h> |