diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-08-05 18:26:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-05 18:26:13 -0400 |
| commit | d6d1d57c69daf301bbefe76b81d8fb12f54a2812 (patch) | |
| tree | 6980684640b9089bed5324388386427fbca63fdf /render | |
| parent | ce886c03539319f7b3327a4adde3c912e349e0f4 (diff) | |
| parent | fdab81e1c95f872e61ab6ff4be65f09fe552f6f2 (diff) | |
Merge pull request #31 from nyorain/merged
Use meson as build system
Diffstat (limited to 'render')
| -rw-r--r-- | render/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | render/gles2/renderer.c | 6 | ||||
| -rw-r--r-- | render/meson.build | 10 |
3 files changed, 15 insertions, 11 deletions
diff --git a/render/CMakeLists.txt b/render/CMakeLists.txt deleted file mode 100644 index d412ddbc..00000000 --- a/render/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -add_library(wlr-render - matrix.c - wlr_renderer.c - wlr_surface.c - gles2/shaders.c - gles2/renderer.c - gles2/surface.c - gles2/pixel_format.c - gles2/util.c -) diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c index 897dc3b8..f2a57a56 100644 --- a/render/gles2/renderer.c +++ b/render/gles2/renderer.c @@ -123,7 +123,11 @@ static void draw_quad() { static bool wlr_gles2_render_surface(struct wlr_renderer_state *state, struct wlr_surface *surface, const float (*matrix)[16]) { - assert(surface && surface->valid); + if(!surface || !surface->valid) { + wlr_log(L_ERROR, "attempt to render invalid surface"); + return false; + } + wlr_surface_bind(surface); GL_CALL(glUniformMatrix4fv(0, 1, GL_FALSE, *matrix)); // TODO: source alpha from somewhere else I guess diff --git a/render/meson.build b/render/meson.build new file mode 100644 index 00000000..2fdba62c --- /dev/null +++ b/render/meson.build @@ -0,0 +1,10 @@ +wlr_files += files( + 'matrix.c', + 'wlr_renderer.c', + 'wlr_surface.c', + 'gles2/pixel_format.c', + 'gles2/renderer.c', + 'gles2/shaders.c', + 'gles2/surface.c', + 'gles2/util.c', +) |