diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-02-13 08:30:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-13 08:30:54 -0500 |
| commit | 71cba94e73022d8cef8651055204a4706377ae11 (patch) | |
| tree | 8ea1a2b6a0414fd7904824ffac330cd4e1e96ca2 /render/gles2 | |
| parent | 3497e53516d96ad67b26115e2e06218f68e1114d (diff) | |
| parent | c2e147401048aa53aebd52f1851b1da8c91043a3 (diff) | |
| download | wlroots-71cba94e73022d8cef8651055204a4706377ae11.tar.xz | |
Merge pull request #627 from emersion/wlr-signal-emit-safe
Remove wlr_backend.events.{output_remove,device_remove}
Diffstat (limited to 'render/gles2')
| -rw-r--r-- | render/gles2/renderer.c | 6 | ||||
| -rw-r--r-- | render/gles2/shaders.c | 2 | ||||
| -rw-r--r-- | render/gles2/texture.c | 9 | ||||
| -rw-r--r-- | render/gles2/util.c | 4 |
4 files changed, 11 insertions, 10 deletions
diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c index f57e9dae..81a932e6 100644 --- a/render/gles2/renderer.c +++ b/render/gles2/renderer.c @@ -1,10 +1,10 @@ -#include <stdint.h> -#include <stdlib.h> #include <assert.h> #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> -#include <wayland-util.h> +#include <stdint.h> +#include <stdlib.h> #include <wayland-server-protocol.h> +#include <wayland-util.h> #include <wlr/backend.h> #include <wlr/render.h> #include <wlr/render/egl.h> diff --git a/render/gles2/shaders.c b/render/gles2/shaders.c index ff6fba9c..46a10248 100644 --- a/render/gles2/shaders.c +++ b/render/gles2/shaders.c @@ -1,5 +1,5 @@ -#include "render/gles2.h" #include <GLES2/gl2.h> +#include "render/gles2.h" // Colored quads const GLchar quad_vertex_src[] = diff --git a/render/gles2/texture.c b/render/gles2/texture.c index ff71cb08..688a51d8 100644 --- a/render/gles2/texture.c +++ b/render/gles2/texture.c @@ -1,16 +1,17 @@ -#include <stdint.h> -#include <stdlib.h> #include <assert.h> #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> -#include <wayland-util.h> +#include <stdint.h> +#include <stdlib.h> #include <wayland-server-protocol.h> +#include <wayland-util.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> #include "render/gles2.h" +#include "util/signal.h" static struct pixel_format external_pixel_format = { .wl_format = 0, @@ -271,7 +272,7 @@ static void gles2_texture_bind(struct wlr_texture *_texture) { static void gles2_texture_destroy(struct wlr_texture *_texture) { struct wlr_gles2_texture *texture = (struct wlr_gles2_texture *)_texture; - wl_signal_emit(&texture->wlr_texture.destroy_signal, &texture->wlr_texture); + wlr_signal_emit_safe(&texture->wlr_texture.destroy_signal, &texture->wlr_texture); if (texture->tex_id) { GL_CALL(glDeleteTextures(1, &texture->tex_id)); } diff --git a/render/gles2/util.c b/render/gles2/util.c index 9498a1cd..c291f533 100644 --- a/render/gles2/util.c +++ b/render/gles2/util.c @@ -1,6 +1,6 @@ -#include <stdlib.h> -#include <stdbool.h> #include <GLES2/gl2.h> +#include <stdbool.h> +#include <stdlib.h> #include <wlr/util/log.h> #include "render/gles2.h" |