diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-10-21 18:08:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-21 18:08:58 -0400 |
| commit | 24ae081001a5a244a76d87e05af832940d78545f (patch) | |
| tree | 46e919d43f03aadc0262f17bf9a4028b76c676ae /render | |
| parent | ce2f945441155fa9d98935dabd6979304f2d2fbc (diff) | |
| parent | 37b8a096a9907ea9c9991750c75d9fb15e445681 (diff) | |
Merge pull request #308 from ascent12/render-fixups
Render fixups
Diffstat (limited to 'render')
| -rw-r--r-- | render/egl.c | 2 | ||||
| -rw-r--r-- | render/gles2/renderer.c | 9 | ||||
| -rw-r--r-- | render/gles2/texture.c | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/render/egl.c b/render/egl.c index 9815b923..08612125 100644 --- a/render/egl.c +++ b/render/egl.c @@ -3,7 +3,7 @@ #include <GLES2/gl2.h> #include <stdlib.h> #include <wlr/util/log.h> -#include <wlr/egl.h> +#include <wlr/render/egl.h> #include "render/glapi.h" // Extension documentation 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> |