diff options
| author | emersion <contact@emersion.fr> | 2018-03-26 19:13:13 -0400 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2018-03-26 19:13:13 -0400 |
| commit | adf4fb08dde2fa3e981213dd6a8c97de1f93c110 (patch) | |
| tree | 97dcf2ad621552035626c1c60b84ab5b09700ca7 /render/gles2 | |
| parent | 3bda7e2ef8db955bb56e9dbf700974de06a2836b (diff) | |
| parent | 891610081fe1a8279fbe50d548bb6d42074aaae1 (diff) | |
Merge branch 'master' into texture-redesign
Diffstat (limited to 'render/gles2')
| -rw-r--r-- | render/gles2/renderer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c index dcda45e9..99884622 100644 --- a/render/gles2/renderer.c +++ b/render/gles2/renderer.c @@ -155,7 +155,7 @@ static bool gles2_render_texture_with_matrix(struct wlr_renderer *wlr_renderer, } -static void gles2_render_quad(struct wlr_renderer *wlr_renderer, +static void gles2_render_quad_with_matrix(struct wlr_renderer *wlr_renderer, const float color[static 4], const float matrix[static 9]) { struct wlr_gles2_renderer *renderer = gles2_get_renderer_in_context(wlr_renderer); @@ -173,7 +173,7 @@ static void gles2_render_quad(struct wlr_renderer *wlr_renderer, GLES2_DEBUG_POP; } -static void gles2_render_ellipse(struct wlr_renderer *wlr_renderer, +static void gles2_render_ellipse_with_matrix(struct wlr_renderer *wlr_renderer, const float color[static 4], const float matrix[static 9]) { struct wlr_gles2_renderer *renderer = gles2_get_renderer_in_context(wlr_renderer); @@ -286,8 +286,8 @@ static const struct wlr_renderer_impl renderer_impl = { .clear = gles2_clear, .scissor = gles2_scissor, .render_texture_with_matrix = gles2_render_texture_with_matrix, - .render_quad = gles2_render_quad, - .render_ellipse = gles2_render_ellipse, + .render_quad_with_matrix = gles2_render_quad_with_matrix, + .render_ellipse_with_matrix = gles2_render_ellipse_with_matrix, .formats = gles2_renderer_formats, .resource_is_wl_drm_buffer = gles2_resource_is_wl_drm_buffer, .wl_drm_buffer_get_size = gles2_wl_drm_buffer_get_size, |