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

Fix example for updated gles

This commit is contained in:
nyorain 2017-08-10 11:03:15 +02:00
parent 67369173aa
commit 1901c3e1b6
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/compositor/main.c
View File

@ -67,7 +67,7 @@ int main() {
}; };
compositor_init(&compositor); compositor_init(&compositor);
state.renderer = wlr_gles2_renderer_init(compositor.backend->egl); state.renderer = wlr_gles2_renderer_init();
wl_display_init_shm(compositor.display); wl_display_init_shm(compositor.display);
wl_compositor_init(compositor.display, &state.compositor, state.renderer); wl_compositor_init(compositor.display, &state.compositor, state.renderer);
wl_shell_init(compositor.display, &state.shell); wl_shell_init(compositor.display, &state.shell);

2
examples/rotation.c
View File

@ -204,7 +204,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);
state.renderer = wlr_gles2_renderer_init(compositor.backend->egl); state.renderer = wlr_gles2_renderer_init();
state.cat_texture = wlr_render_texture_init(state.renderer); state.cat_texture = wlr_render_texture_init(state.renderer);
wlr_texture_upload_pixels(state.cat_texture, WL_SHM_FORMAT_ABGR8888, wlr_texture_upload_pixels(state.cat_texture, WL_SHM_FORMAT_ABGR8888,
cat_tex.width, cat_tex.width, cat_tex.height, cat_tex.pixel_data); cat_tex.width, cat_tex.width, cat_tex.height, cat_tex.pixel_data);

3
examples/tablet.c
View File

@ -152,8 +152,7 @@ int main(int argc, char *argv[]) {
}; };
compositor_init(&compositor); compositor_init(&compositor);
state.renderer = wlr_gles2_renderer_init(compositor.backend->egl); state.renderer = wlr_gles2_renderer_init();
compositor_run(&compositor); compositor_run(&compositor);
wlr_renderer_destroy(state.renderer); wlr_renderer_destroy(state.renderer);

2
examples/touch.c
View File

@ -104,7 +104,7 @@ int main(int argc, char *argv[]) {
}; };
compositor_init(&compositor); compositor_init(&compositor);
state.renderer = wlr_gles2_renderer_init(compositor.backend->egl); state.renderer = wlr_gles2_renderer_init();
state.cat_texture = wlr_render_texture_init(state.renderer); state.cat_texture = wlr_render_texture_init(state.renderer);
wlr_texture_upload_pixels(state.cat_texture, WL_SHM_FORMAT_ARGB8888, wlr_texture_upload_pixels(state.cat_texture, WL_SHM_FORMAT_ARGB8888,
cat_tex.width, cat_tex.width, cat_tex.height, cat_tex.pixel_data); cat_tex.width, cat_tex.width, cat_tex.height, cat_tex.pixel_data);

2
include/render/gles2.h
View File

@ -31,7 +31,7 @@ struct shaders {
GLuint rgba, rgbx; GLuint rgba, rgbx;
GLuint quad; GLuint quad;
GLuint ellipse; GLuint ellipse;
Gluint external; GLuint external;
}; };
extern struct shaders shaders; extern struct shaders shaders;