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

Merge pull request #802 from emersion/examples-remove-egl 

examples: get wlr_renderer from the backend
This commit is contained in:
Drew DeVault 2018-04-02 10:12:19 -04:00 committed by GitHub
parent ee1a2f2f8a f63a5d881d
commit 7a1e02be78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/output-layout.c
View File

@ -13,7 +13,6 @@
#include <wayland-server.h> #include <wayland-server.h>
#include <wlr/backend.h> #include <wlr/backend.h>
#include <wlr/backend/session.h> #include <wlr/backend/session.h>
#include <wlr/render/gles2.h>
#include <wlr/render/wlr_renderer.h> #include <wlr/render/wlr_renderer.h>
#include <wlr/types/wlr_keyboard.h> #include <wlr/types/wlr_keyboard.h>
#include <wlr/types/wlr_matrix.h> #include <wlr/types/wlr_matrix.h>
@ -196,8 +195,7 @@ int main(int argc, char *argv[]) {
compositor.keyboard_key_cb = handle_keyboard_key; compositor.keyboard_key_cb = handle_keyboard_key;
compositor_init(&compositor); compositor_init(&compositor);
struct wlr_egl *egl = wlr_backend_get_egl(compositor.backend); state.renderer = wlr_backend_get_renderer(compositor.backend);
state.renderer = wlr_gles2_renderer_create(egl);
state.cat_texture = wlr_texture_from_pixels(state.renderer, state.cat_texture = wlr_texture_from_pixels(state.renderer,
WL_SHM_FORMAT_ABGR8888, cat_tex.width * 4, cat_tex.width, cat_tex.height, WL_SHM_FORMAT_ABGR8888, cat_tex.width * 4, cat_tex.width, cat_tex.height,
cat_tex.pixel_data); cat_tex.pixel_data);

4
examples/rotation.c
View File

@ -13,7 +13,6 @@
#include <wlr/backend.h> #include <wlr/backend.h>
#include <wlr/backend/session.h> #include <wlr/backend/session.h>
#include <wlr/render/wlr_renderer.h> #include <wlr/render/wlr_renderer.h>
#include <wlr/render/gles2.h>
#include <wlr/types/wlr_keyboard.h> #include <wlr/types/wlr_keyboard.h>
#include <wlr/types/wlr_matrix.h> #include <wlr/types/wlr_matrix.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
@ -137,8 +136,7 @@ int main(int argc, char *argv[]) {
compositor.keyboard_key_cb = handle_keyboard_key; compositor.keyboard_key_cb = handle_keyboard_key;
compositor_init(&compositor); compositor_init(&compositor);
struct wlr_egl *egl = wlr_backend_get_egl(compositor.backend); state.renderer = wlr_backend_get_renderer(compositor.backend);
state.renderer = wlr_gles2_renderer_create(egl);
if (!state.renderer) { if (!state.renderer) {
wlr_log(L_ERROR, "Could not start compositor, OOM"); wlr_log(L_ERROR, "Could not start compositor, OOM");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);

4
examples/tablet.c
View File

@ -11,7 +11,6 @@
#include <wayland-server.h> #include <wayland-server.h>
#include <wlr/backend.h> #include <wlr/backend.h>
#include <wlr/backend/session.h> #include <wlr/backend/session.h>
#include <wlr/render/gles2.h>
#include <wlr/render/wlr_renderer.h> #include <wlr/render/wlr_renderer.h>
#include <wlr/types/wlr_box.h> #include <wlr/types/wlr_box.h>
#include <wlr/types/wlr_matrix.h> #include <wlr/types/wlr_matrix.h>
@ -192,8 +191,7 @@ int main(int argc, char *argv[]) {
}; };
compositor_init(&compositor); compositor_init(&compositor);
struct wlr_egl *egl = wlr_backend_get_egl(compositor.backend); state.renderer = wlr_backend_get_renderer(compositor.backend);
state.renderer = wlr_gles2_renderer_create(egl);
if (!state.renderer) { if (!state.renderer) {
wlr_log(L_ERROR, "Could not start compositor, OOM"); wlr_log(L_ERROR, "Could not start compositor, OOM");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);

4
examples/touch.c
View File

@ -12,7 +12,6 @@
#include <wayland-server.h> #include <wayland-server.h>
#include <wlr/backend.h> #include <wlr/backend.h>
#include <wlr/backend/session.h> #include <wlr/backend/session.h>
#include <wlr/render/gles2.h>
#include <wlr/render/wlr_renderer.h> #include <wlr/render/wlr_renderer.h>
#include <wlr/types/wlr_list.h> #include <wlr/types/wlr_list.h>
#include <wlr/types/wlr_matrix.h> #include <wlr/types/wlr_matrix.h>
@ -108,8 +107,7 @@ int main(int argc, char *argv[]) {
}; };
compositor_init(&compositor); compositor_init(&compositor);
struct wlr_egl *egl = wlr_backend_get_egl(compositor.backend); state.renderer = wlr_backend_get_renderer(compositor.backend);
state.renderer = wlr_gles2_renderer_create(egl);
if (!state.renderer) { if (!state.renderer) {
wlr_log(L_ERROR, "Could not start compositor, OOM"); wlr_log(L_ERROR, "Could not start compositor, OOM");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);