diff options
Diffstat (limited to 'render/gles2')
| -rw-r--r-- | render/gles2/renderer.c | 6 | ||||
| -rw-r--r-- | render/gles2/texture.c | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c index 81a932e6..ad739cf8 100644 --- a/render/gles2/renderer.c +++ b/render/gles2/renderer.c @@ -171,7 +171,7 @@ static void draw_quad() { } static bool wlr_gles2_render_texture(struct wlr_renderer *wlr_renderer, - struct wlr_texture *texture, const float (*matrix)[16]) { + struct wlr_texture *texture, const float (*matrix)[16], float alpha) { if (!texture || !texture->valid) { wlr_log(L_ERROR, "attempt to render invalid texture"); return false; @@ -179,12 +179,12 @@ static bool wlr_gles2_render_texture(struct wlr_renderer *wlr_renderer, wlr_texture_bind(texture); GL_CALL(glUniformMatrix4fv(0, 1, GL_FALSE, *matrix)); - // TODO: source alpha from somewhere else I guess - GL_CALL(glUniform1f(2, 1.0f)); + GL_CALL(glUniform1f(2, alpha)); draw_quad(); return true; } + static void wlr_gles2_render_quad(struct wlr_renderer *wlr_renderer, const float (*color)[4], const float (*matrix)[16]) { GL_CALL(glUseProgram(shaders.quad)); diff --git a/render/gles2/texture.c b/render/gles2/texture.c index 688a51d8..241b94a8 100644 --- a/render/gles2/texture.c +++ b/render/gles2/texture.c @@ -86,7 +86,8 @@ static bool gles2_texture_upload_shm(struct wlr_texture *_texture, struct wlr_gles2_texture *texture = (struct wlr_gles2_texture *)_texture; const struct pixel_format *fmt = gl_format_for_wl_format(format); if (!fmt || !fmt->gl_format) { - wlr_log(L_ERROR, "No supported pixel format for this texture"); + wlr_log(L_ERROR, "Unsupported pixel format %"PRIu32" for this texture", + format); return false; } wl_shm_buffer_begin_access(buffer); |