wlroots/render/gles2/renderer.c

849 lines
25 KiB
C
Raw Normal View History

#include <assert.h>
2017-06-23 11:38:45 -04:00
#include <GLES2/gl2.h>
2017-08-09 21:25:34 +02:00
#include <GLES2/gl2ext.h>
2018-02-12 21:29:23 +01:00
#include <stdint.h>
#include <stdio.h>
2018-02-12 21:29:23 +01:00
#include <stdlib.h>
#include <wayland-server-protocol.h>
2018-02-12 21:29:23 +01:00
#include <wayland-util.h>
2017-10-21 14:48:58 +13:00
#include <wlr/render/egl.h>
#include <wlr/render/interface.h>
#include <wlr/render/wlr_renderer.h>
2018-03-15 09:11:03 +01:00
#include <wlr/types/wlr_matrix.h>
#include <wlr/types/wlr_linux_dmabuf_v1.h>
2017-06-21 12:10:07 -04:00
#include <wlr/util/log.h>
#include "render/gles2.h"
static const GLfloat verts[] = {
1, 0, // top right
0, 0, // top left
1, 1, // bottom right
0, 1, // bottom left
};
static const struct wlr_renderer_impl renderer_impl;
struct wlr_gles2_renderer *gles2_get_renderer(
struct wlr_renderer *wlr_renderer) {
assert(wlr_renderer->impl == &renderer_impl);
return (struct wlr_gles2_renderer *)wlr_renderer;
}
static struct wlr_gles2_renderer *gles2_get_renderer_in_context(
struct wlr_renderer *wlr_renderer) {
struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer);
assert(wlr_egl_is_current(renderer->egl));
return renderer;
}
static void gles2_begin(struct wlr_renderer *wlr_renderer, uint32_t width,
uint32_t height) {
struct wlr_gles2_renderer *renderer =
gles2_get_renderer_in_context(wlr_renderer);
push_gles2_debug(renderer);
glViewport(0, 0, width, height);
renderer->viewport_width = width;
renderer->viewport_height = height;
2020-08-03 11:25:09 +02:00
renderer->color = NULL;
// enable transparency
glEnable(GL_BLEND);
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
// XXX: maybe we should save output projection and remove some of the need
// for users to sling matricies themselves
pop_gles2_debug(renderer);
}
static void gles2_end(struct wlr_renderer *wlr_renderer) {
gles2_get_renderer_in_context(wlr_renderer);
// no-op
}
static void gles2_clear(struct wlr_renderer *wlr_renderer,
const float color[static 4]) {
struct wlr_gles2_renderer *renderer =
gles2_get_renderer_in_context(wlr_renderer);
push_gles2_debug(renderer);
glClearColor(color[0], color[1], color[2], color[3]);
glClear(GL_COLOR_BUFFER_BIT);
pop_gles2_debug(renderer);
}
static void gles2_scissor(struct wlr_renderer *wlr_renderer,
struct wlr_box *box) {
struct wlr_gles2_renderer *renderer =
gles2_get_renderer_in_context(wlr_renderer);
push_gles2_debug(renderer);
if (box != NULL) {
struct wlr_box gl_box;
wlr_box_transform(&gl_box, box, WL_OUTPUT_TRANSFORM_FLIPPED_180,
renderer->viewport_width, renderer->viewport_height);
glScissor(gl_box.x, gl_box.y, gl_box.width, gl_box.height);
glEnable(GL_SCISSOR_TEST);
} else {
glDisable(GL_SCISSOR_TEST);
}
pop_gles2_debug(renderer);
}
2020-08-03 11:25:09 +02:00
static void gles2_color_config(struct wlr_renderer *wlr_renderer, struct wlr_color_config *color) {
struct wlr_gles2_renderer *renderer =
gles2_get_renderer_in_context(wlr_renderer);
renderer->color = color;
}
static bool gles2_render_subtexture_with_matrix(
struct wlr_renderer *wlr_renderer, struct wlr_texture *wlr_texture,
const struct wlr_fbox *box, const float matrix[static 9],
float alpha) {
struct wlr_gles2_renderer *renderer =
gles2_get_renderer_in_context(wlr_renderer);
struct wlr_gles2_texture *texture =
gles2_get_texture(wlr_texture);
2017-07-17 20:38:28 +02:00
struct wlr_gles2_tex_shader *shader = NULL;
switch (texture->target) {
case GL_TEXTURE_2D:
if (texture->has_alpha) {
shader = &renderer->shaders.tex_rgba;
} else {
shader = &renderer->shaders.tex_rgbx;
}
break;
case GL_TEXTURE_EXTERNAL_OES:
shader = &renderer->shaders.tex_ext;
if (!renderer->exts.egl_image_external_oes) {
wlr_log(WLR_ERROR, "Failed to render texture: "
"GL_TEXTURE_EXTERNAL_OES not supported");
return false;
}
break;
default:
abort();
}
// OpenGL ES 2 requires the glUniformMatrix3fv transpose parameter to be set
// to GL_FALSE
float transposition[9];
wlr_matrix_transpose(transposition, matrix);
push_gles2_debug(renderer);
glActiveTexture(GL_TEXTURE0);
glBindTexture(texture->target, texture->tex);
glTexParameteri(texture->target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glUseProgram(shader->program);
glUniformMatrix3fv(shader->proj, 1, GL_FALSE, transposition);
glUniform1i(shader->invert_y, texture->inverted_y);
glUniform1i(shader->tex, 0);
glUniform1f(shader->alpha, alpha);
const GLfloat x1 = box->x / wlr_texture->width;
const GLfloat y1 = box->y / wlr_texture->height;
const GLfloat x2 = (box->x + box->width) / wlr_texture->width;
const GLfloat y2 = (box->y + box->height) / wlr_texture->height;
const GLfloat texcoord[] = {
x2, y1, // top right
x1, y1, // top left
x2, y2, // bottom right
x1, y2, // bottom left
};
glVertexAttribPointer(shader->pos_attrib, 2, GL_FLOAT, GL_FALSE, 0, verts);
glVertexAttribPointer(shader->tex_attrib, 2, GL_FLOAT, GL_FALSE, 0, texcoord);
glEnableVertexAttribArray(shader->pos_attrib);
glEnableVertexAttribArray(shader->tex_attrib);
2020-07-14 17:01:25 +00:00
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
2020-08-03 11:25:09 +02:00
GLuint color_table = color_build_lut(wlr_texture->color, renderer->color);
2020-07-14 17:01:25 +00:00
glActiveTexture(GL_TEXTURE1);
glBindTexture(GL_TEXTURE_3D, color_table);
glUniform1i(shader->color_table, 1);
glUniform1i(shader->color_enable, color_table != 0);
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
glDisableVertexAttribArray(shader->pos_attrib);
glDisableVertexAttribArray(shader->tex_attrib);
glBindTexture(texture->target, 0);
pop_gles2_debug(renderer);
return true;
}
static void gles2_render_quad_with_matrix(struct wlr_renderer *wlr_renderer,
2018-03-15 15:33:58 +01:00
const float color[static 4], const float matrix[static 9]) {
struct wlr_gles2_renderer *renderer =
gles2_get_renderer_in_context(wlr_renderer);
// OpenGL ES 2 requires the glUniformMatrix3fv transpose parameter to be set
// to GL_FALSE
float transposition[9];
wlr_matrix_transpose(transposition, matrix);
2020-07-14 17:01:25 +00:00
float converted[4];
2020-08-03 11:25:09 +02:00
color_convert(NULL, renderer->color, color, converted);
2020-07-14 17:01:25 +00:00
push_gles2_debug(renderer);
glUseProgram(renderer->shaders.quad.program);
glUniformMatrix3fv(renderer->shaders.quad.proj, 1, GL_FALSE, transposition);
2020-07-14 17:01:25 +00:00
glUniform4f(renderer->shaders.quad.color, converted[0], converted[1], converted[2], converted[3]);
glVertexAttribPointer(renderer->shaders.quad.pos_attrib, 2, GL_FLOAT, GL_FALSE,
0, verts);
glEnableVertexAttribArray(renderer->shaders.quad.pos_attrib);
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
glDisableVertexAttribArray(renderer->shaders.quad.pos_attrib);
pop_gles2_debug(renderer);
}
static void gles2_render_ellipse_with_matrix(struct wlr_renderer *wlr_renderer,
2018-03-15 15:33:58 +01:00
const float color[static 4], const float matrix[static 9]) {
struct wlr_gles2_renderer *renderer =
gles2_get_renderer_in_context(wlr_renderer);
// OpenGL ES 2 requires the glUniformMatrix3fv transpose parameter to be set
// to GL_FALSE
float transposition[9];
wlr_matrix_transpose(transposition, matrix);
static const GLfloat texcoord[] = {
1, 0, // top right
0, 0, // top left
1, 1, // bottom right
0, 1, // bottom left
};
2020-07-14 17:01:25 +00:00
float converted[4];
2020-08-03 11:25:09 +02:00
color_convert(NULL, renderer->color, color, converted);
2020-07-14 17:01:25 +00:00
push_gles2_debug(renderer);
glUseProgram(renderer->shaders.ellipse.program);
glUniformMatrix3fv(renderer->shaders.ellipse.proj, 1, GL_FALSE, transposition);
2020-07-14 17:01:25 +00:00
glUniform4f(renderer->shaders.ellipse.color, converted[0], converted[1], converted[2], converted[3]);
glVertexAttribPointer(renderer->shaders.ellipse.pos_attrib, 2, GL_FLOAT,
GL_FALSE, 0, verts);
glVertexAttribPointer(renderer->shaders.ellipse.tex_attrib, 2, GL_FLOAT,
GL_FALSE, 0, texcoord);
glEnableVertexAttribArray(renderer->shaders.ellipse.pos_attrib);
glEnableVertexAttribArray(renderer->shaders.ellipse.tex_attrib);
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
glDisableVertexAttribArray(renderer->shaders.ellipse.pos_attrib);
glDisableVertexAttribArray(renderer->shaders.ellipse.tex_attrib);
pop_gles2_debug(renderer);
}
static const enum wl_shm_format *gles2_renderer_formats(
struct wlr_renderer *wlr_renderer, size_t *len) {
return get_gles2_wl_formats(len);
}
static bool gles2_format_supported(struct wlr_renderer *wlr_renderer,
enum wl_shm_format wl_fmt) {
return get_gles2_format_from_wl(wl_fmt) != NULL;
2017-06-22 16:32:47 -04:00
}
static bool gles2_resource_is_wl_drm_buffer(struct wlr_renderer *wlr_renderer,
struct wl_resource *resource) {
struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer);
if (!renderer->egl->exts.bind_wayland_display_wl) {
return false;
}
EGLint fmt;
return renderer->egl->procs.eglQueryWaylandBufferWL(renderer->egl->display,
2020-07-14 17:01:25 +00:00
resource, EGL_TEXTURE_FORMAT, &fmt);
}
static void gles2_wl_drm_buffer_get_size(struct wlr_renderer *wlr_renderer,
struct wl_resource *buffer, int *width, int *height) {
struct wlr_gles2_renderer *renderer =
gles2_get_renderer(wlr_renderer);
if (!renderer->egl->exts.bind_wayland_display_wl) {
return;
}
renderer->egl->procs.eglQueryWaylandBufferWL(renderer->egl->display,
buffer, EGL_WIDTH, width);
renderer->egl->procs.eglQueryWaylandBufferWL(renderer->egl->display,
buffer, EGL_HEIGHT, height);
}
static const struct wlr_drm_format_set *gles2_get_dmabuf_formats(
struct wlr_renderer *wlr_renderer) {
2018-04-08 11:00:56 -04:00
struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer);
return wlr_egl_get_dmabuf_formats(renderer->egl);
2018-04-08 11:00:56 -04:00
}
static enum wl_shm_format gles2_preferred_read_format(
struct wlr_renderer *wlr_renderer) {
struct wlr_gles2_renderer *renderer =
gles2_get_renderer_in_context(wlr_renderer);
GLint gl_format = -1, gl_type = -1;
push_gles2_debug(renderer);
glGetIntegerv(GL_IMPLEMENTATION_COLOR_READ_FORMAT, &gl_format);
glGetIntegerv(GL_IMPLEMENTATION_COLOR_READ_TYPE, &gl_type);
pop_gles2_debug(renderer);
EGLint alpha_size = -1;
eglGetConfigAttrib(renderer->egl->display, renderer->egl->config,
EGL_ALPHA_SIZE, &alpha_size);
const struct wlr_gles2_pixel_format *fmt =
get_gles2_format_from_gl(gl_format, gl_type, alpha_size > 0);
if (fmt != NULL) {
return fmt->wl_format;
}
if (renderer->exts.read_format_bgra_ext) {
return WL_SHM_FORMAT_XRGB8888;
}
return WL_SHM_FORMAT_XBGR8888;
}
static bool gles2_read_pixels(struct wlr_renderer *wlr_renderer,
enum wl_shm_format wl_fmt, uint32_t *flags, uint32_t stride,
uint32_t width, uint32_t height, uint32_t src_x, uint32_t src_y,
uint32_t dst_x, uint32_t dst_y, void *data) {
struct wlr_gles2_renderer *renderer =
gles2_get_renderer_in_context(wlr_renderer);
const struct wlr_gles2_pixel_format *fmt = get_gles2_format_from_wl(wl_fmt);
if (fmt == NULL) {
2018-07-09 22:49:54 +01:00
wlr_log(WLR_ERROR, "Cannot read pixels: unsupported pixel format");
return false;
}
if (fmt->gl_format == GL_BGRA_EXT && !renderer->exts.read_format_bgra_ext) {
wlr_log(WLR_ERROR,
"Cannot read pixels: missing GL_EXT_read_format_bgra extension");
return false;
}
push_gles2_debug(renderer);
// Make sure any pending drawing is finished before we try to read it
glFinish();
glGetError(); // Clear the error flag
2019-02-28 23:15:34 +01:00
unsigned char *p = (unsigned char *)data + dst_y * stride;
uint32_t pack_stride = width * fmt->bpp / 8;
if (pack_stride == stride && dst_x == 0 && flags != NULL) {
// Under these particular conditions, we can read the pixels with only
// one glReadPixels call
glReadPixels(src_x, renderer->viewport_height - height - src_y,
width, height, fmt->gl_format, fmt->gl_type, p);
*flags = WLR_RENDERER_READ_PIXELS_Y_INVERT;
} else {
// Unfortunately GLES2 doesn't support GL_PACK_*, so we have to read
// the lines out row by row
for (size_t i = 0; i < height; ++i) {
glReadPixels(src_x, renderer->viewport_height - src_y - i - 1, width, 1, fmt->gl_format,
fmt->gl_type, p + i * stride + dst_x * fmt->bpp / 8);
}
if (flags != NULL) {
*flags = 0;
}
}
pop_gles2_debug(renderer);
2018-06-30 23:19:02 +01:00
return glGetError() == GL_NO_ERROR;
}
2020-04-22 23:23:56 +00:00
static bool gles2_blit_dmabuf(struct wlr_renderer *wlr_renderer,
struct wlr_dmabuf_attributes *dst_attr,
struct wlr_dmabuf_attributes *src_attr) {
struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer);
if (!renderer->procs.glEGLImageTargetRenderbufferStorageOES) {
2020-04-22 23:23:56 +00:00
return false;
}
struct wlr_egl_context old_context;
wlr_egl_save_context(&old_context);
bool r = false;
struct wlr_texture *src_tex =
wlr_texture_from_dmabuf(wlr_renderer, src_attr);
if (!src_tex) {
goto restore_context_out;
}
// This is to take into account y-inversion on both buffers rather than
// just the source buffer.
bool src_inverted_y =
!!(src_attr->flags & WLR_DMABUF_ATTRIBUTES_FLAGS_Y_INVERT);
bool dst_inverted_y =
!!(dst_attr->flags & WLR_DMABUF_ATTRIBUTES_FLAGS_Y_INVERT);
struct wlr_gles2_texture *gles2_src_tex = gles2_get_texture(src_tex);
// The result is negated because wlr_matrix_projection y-inverts the
// texture.
gles2_src_tex->inverted_y = !(src_inverted_y ^ dst_inverted_y);
2020-04-22 23:23:56 +00:00
if (!wlr_egl_make_current(renderer->egl, EGL_NO_SURFACE, NULL)) {
2020-04-22 23:23:56 +00:00
goto texture_destroy_out;
}
// TODO: The imported buffer should be checked with
// eglQueryDmaBufModifiersEXT to see if it may be modified.
bool external_only = false;
EGLImageKHR image = wlr_egl_create_image_from_dmabuf(renderer->egl, dst_attr,
&external_only);
2020-04-22 23:23:56 +00:00
if (image == EGL_NO_IMAGE_KHR) {
goto texture_destroy_out;
}
GLuint rbo = 0;
glGenRenderbuffers(1, &rbo);
glBindRenderbuffer(GL_RENDERBUFFER, rbo);
renderer->procs.glEGLImageTargetRenderbufferStorageOES(GL_RENDERBUFFER,
2020-04-22 23:23:56 +00:00
image);
glBindRenderbuffer(GL_RENDERBUFFER, 0);
GLuint fbo = 0;
glGenFramebuffers(1, &fbo);
glBindFramebuffer(GL_FRAMEBUFFER, fbo);
glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
GL_RENDERBUFFER, rbo);
GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
if (status != GL_FRAMEBUFFER_COMPLETE) {
goto out;
}
// TODO: use ANGLE_framebuffer_blit if available
float mat[9];
wlr_matrix_projection(mat, 1, 1, WL_OUTPUT_TRANSFORM_NORMAL);
wlr_renderer_begin(wlr_renderer, dst_attr->width, dst_attr->height);
wlr_renderer_clear(wlr_renderer, (float[]){ 0.0, 0.0, 0.0, 0.0 });
wlr_render_texture_with_matrix(wlr_renderer, src_tex, mat, 1.0f);
wlr_renderer_end(wlr_renderer);
r = true;
out:
glBindFramebuffer(GL_FRAMEBUFFER, 0);
glDeleteFramebuffers(1, &fbo);
glDeleteRenderbuffers(1, &rbo);
wlr_egl_destroy_image(renderer->egl, image);
2020-04-22 23:23:56 +00:00
texture_destroy_out:
wlr_texture_destroy(src_tex);
restore_context_out:
wlr_egl_restore_context(&old_context);
return r;
}
static bool gles2_init_wl_display(struct wlr_renderer *wlr_renderer,
2018-05-21 19:07:08 +01:00
struct wl_display *wl_display) {
struct wlr_gles2_renderer *renderer =
gles2_get_renderer(wlr_renderer);
if (renderer->egl->exts.bind_wayland_display_wl) {
if (!wlr_egl_bind_display(renderer->egl, wl_display)) {
wlr_log(WLR_ERROR, "Failed to bind wl_display to EGL");
return false;
}
} else {
wlr_log(WLR_INFO, "EGL_WL_bind_wayland_display is not supported");
2018-05-21 19:07:08 +01:00
}
if (renderer->egl->exts.image_dmabuf_import_ext) {
if (wlr_linux_dmabuf_v1_create(wl_display, wlr_renderer) == NULL) {
return false;
}
} else {
wlr_log(WLR_INFO, "EGL_EXT_image_dma_buf_import is not supported");
}
return true;
2018-05-21 19:07:08 +01:00
}
2019-11-07 13:38:45 -05:00
struct wlr_egl *wlr_gles2_renderer_get_egl(struct wlr_renderer *wlr_renderer) {
struct wlr_gles2_renderer *renderer =
gles2_get_renderer(wlr_renderer);
return renderer->egl;
}
static void gles2_destroy(struct wlr_renderer *wlr_renderer) {
struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer);
wlr_egl_make_current(renderer->egl, EGL_NO_SURFACE, NULL);
push_gles2_debug(renderer);
glDeleteProgram(renderer->shaders.quad.program);
glDeleteProgram(renderer->shaders.ellipse.program);
glDeleteProgram(renderer->shaders.tex_rgba.program);
glDeleteProgram(renderer->shaders.tex_rgbx.program);
glDeleteProgram(renderer->shaders.tex_ext.program);
pop_gles2_debug(renderer);
if (renderer->exts.debug_khr) {
glDisable(GL_DEBUG_OUTPUT_KHR);
renderer->procs.glDebugMessageCallbackKHR(NULL, NULL);
}
wlr_egl_unset_current(renderer->egl);
free(renderer);
}
static const struct wlr_renderer_impl renderer_impl = {
.destroy = gles2_destroy,
.begin = gles2_begin,
.end = gles2_end,
.clear = gles2_clear,
.scissor = gles2_scissor,
2020-08-03 11:25:09 +02:00
.color_config = gles2_color_config,
.render_subtexture_with_matrix = gles2_render_subtexture_with_matrix,
.render_quad_with_matrix = gles2_render_quad_with_matrix,
.render_ellipse_with_matrix = gles2_render_ellipse_with_matrix,
.formats = gles2_renderer_formats,
.format_supported = gles2_format_supported,
.resource_is_wl_drm_buffer = gles2_resource_is_wl_drm_buffer,
.wl_drm_buffer_get_size = gles2_wl_drm_buffer_get_size,
2018-04-08 11:00:56 -04:00
.get_dmabuf_formats = gles2_get_dmabuf_formats,
.preferred_read_format = gles2_preferred_read_format,
.read_pixels = gles2_read_pixels,
.texture_from_pixels = gles2_texture_from_pixels,
.texture_from_wl_drm = gles2_texture_from_wl_drm,
.texture_from_dmabuf = gles2_texture_from_dmabuf,
2018-05-21 19:07:08 +01:00
.init_wl_display = gles2_init_wl_display,
2020-04-22 23:23:56 +00:00
.blit_dmabuf = gles2_blit_dmabuf,
};
void push_gles2_debug_(struct wlr_gles2_renderer *renderer,
const char *file, const char *func) {
if (!renderer->procs.glPushDebugGroupKHR) {
return;
}
int len = snprintf(NULL, 0, "%s:%s", file, func) + 1;
char str[len];
snprintf(str, len, "%s:%s", file, func);
renderer->procs.glPushDebugGroupKHR(GL_DEBUG_SOURCE_APPLICATION_KHR, 1, -1, str);
}
void pop_gles2_debug(struct wlr_gles2_renderer *renderer) {
if (renderer->procs.glPopDebugGroupKHR) {
renderer->procs.glPopDebugGroupKHR();
}
}
2018-07-09 22:49:54 +01:00
static enum wlr_log_importance gles2_log_importance_to_wlr(GLenum type) {
switch (type) {
2018-07-09 22:49:54 +01:00
case GL_DEBUG_TYPE_ERROR_KHR: return WLR_ERROR;
case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_KHR: return WLR_DEBUG;
case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_KHR: return WLR_ERROR;
case GL_DEBUG_TYPE_PORTABILITY_KHR: return WLR_DEBUG;
case GL_DEBUG_TYPE_PERFORMANCE_KHR: return WLR_DEBUG;
case GL_DEBUG_TYPE_OTHER_KHR: return WLR_DEBUG;
case GL_DEBUG_TYPE_MARKER_KHR: return WLR_DEBUG;
case GL_DEBUG_TYPE_PUSH_GROUP_KHR: return WLR_DEBUG;
case GL_DEBUG_TYPE_POP_GROUP_KHR: return WLR_DEBUG;
default: return WLR_DEBUG;
}
}
static void gles2_log(GLenum src, GLenum type, GLuint id, GLenum severity,
GLsizei len, const GLchar *msg, const void *user) {
_wlr_log(gles2_log_importance_to_wlr(type), "[GLES2] %s", msg);
}
static GLuint compile_shader(struct wlr_gles2_renderer *renderer,
GLuint type, const GLchar *src) {
push_gles2_debug(renderer);
GLuint shader = glCreateShader(type);
glShaderSource(shader, 1, &src, NULL);
glCompileShader(shader);
GLint ok;
glGetShaderiv(shader, GL_COMPILE_STATUS, &ok);
if (ok == GL_FALSE) {
glDeleteShader(shader);
shader = 0;
}
pop_gles2_debug(renderer);
return shader;
}
static GLuint link_program(struct wlr_gles2_renderer *renderer,
const GLchar *vert_src, const GLchar *frag_src) {
push_gles2_debug(renderer);
GLuint vert = compile_shader(renderer, GL_VERTEX_SHADER, vert_src);
if (!vert) {
goto error;
}
GLuint frag = compile_shader(renderer, GL_FRAGMENT_SHADER, frag_src);
if (!frag) {
glDeleteShader(vert);
goto error;
}
GLuint prog = glCreateProgram();
glAttachShader(prog, vert);
glAttachShader(prog, frag);
glLinkProgram(prog);
glDetachShader(prog, vert);
glDetachShader(prog, frag);
glDeleteShader(vert);
glDeleteShader(frag);
GLint ok;
glGetProgramiv(prog, GL_LINK_STATUS, &ok);
if (ok == GL_FALSE) {
glDeleteProgram(prog);
goto error;
}
pop_gles2_debug(renderer);
return prog;
error:
pop_gles2_debug(renderer);
return 0;
}
static bool check_gl_ext(const char *exts, const char *ext) {
size_t extlen = strlen(ext);
const char *end = exts + strlen(exts);
while (exts < end) {
if (exts[0] == ' ') {
exts++;
continue;
}
size_t n = strcspn(exts, " ");
if (n == extlen && strncmp(ext, exts, n) == 0) {
return true;
}
exts += n;
}
return false;
}
static void load_gl_proc(void *proc_ptr, const char *name) {
void *proc = (void *)eglGetProcAddress(name);
if (proc == NULL) {
wlr_log(WLR_ERROR, "eglGetProcAddress(%s) failed", name);
abort();
}
*(void **)proc_ptr = proc;
}
extern const GLchar quad_vertex_src[];
extern const GLchar quad_fragment_src[];
extern const GLchar ellipse_fragment_src[];
extern const GLchar tex_vertex_src[];
2020-07-14 17:01:25 +00:00
extern struct wlr_gles2_tex_shader
tex_fragment_src_rgba,
tex_fragment_src_rgbx,
tex_fragment_src_external;
// return true on success
wlroots 0.12.0 Antonin Décimo (3): Fix typos Fix incorrect format parameters xwayland: free server in error path Daniel De Graaf (1): wlr_virtual_keyboard: fix fd leak Daniel Kondor (2): foreign-toplevel-management: report parent toplevel foreign toplevel: send parent event only to clients that support it Devin J. Pohly (1): drm: fix uninitialized read Drew DeVault (1): Remove xdg-shell v6 Guido Cella (1): render: Don't crash on 0 dimensions Ilia Bozhinov (9): xwayland: do not allow apps to change focus after wlroots request make sure to fail setting gamma on disabled outputs backend/wayland: destroy relative pointer when output is disconnected wayland: emit relative pointer events only for current pointer xwayland: disconnect display destroy listener even if xwayland didn't initialize xwayland: add set_geometry event backend/wayland: add touch support to the wayland backend xdg_shell: fix a typo xdg_shell: handle inert popups Isaac Freund (6): xdg-shell: split last-acked and current state layer-shell: add for_each_popup layer-shell: error on 0 dimension without anchors xdg_positioner: remove unused field wlr_drag: remove unused point_destroy field xwayland: remove unused listener Kenny Levinsen (2): session: Add libseat backend session: Add missing init to direct-freebsd Marten Ringwelski (1): backend/drm: Check if output is enabled before sending frame event Mykola Orliuk (5): backend/wayland: manage cursor for current pointer backend/wayland: factor out wlr_wl_seat backend/wayland: add error flow in create_wl_seat backend/wayland: fix input creation error handling backend/wayland: fix some keyboard/touch leaks Patrick Steinhardt (1): session: Don't refuse unprivileged creation of "direct" backend Roman Gilg (3): output-management-v1: add head identifying events output-management-v1: send head identifying information output-management-v1: send complete head state on enable change Ronan Pigott (1): virtual_pointer: remember current axis for axis events Rouven Czerwinski (2): examples: remove unnecessary gles2.h imports xwm: add loop detection for read_surface_parent Ryan Walklin (4): Implement logind session SetType method to change session type to wayland Also set XDG_SESSION_TYPE Don't set XDG_SESSION_TYPE unless logind SetType succeeds Quieten failure to set login session type Scott Moreau (2): xwm: Set _NET_WM_STATE_FOCUSED property for the focused surface foreign toplevel: Fix whitespace error Simon Ser (31): xwayland/xwm: don't insert surface in list on error xwayland/xwm: add prop count assert in xsurface_set_net_wm_state xwayland/xwm: use initializer for props in xsurface_set_wm_state render/gles2: make wlr_gles2_texture_from_* private render/gles2: keep ref to wlr_gles2_renderer in wlr_gles2_texture render/gles2: make push/pop debug functions take a wlr_renderer render/gles2: remove gles2_procs gamma-control-v1: fix use-after-free in gamma_control_handle_set_gamma examples/simple: use wlr_output_preferred_mode examples/simple: use wlr_renderer instead of GL Remove unnecessary wl_display_dispatch calls output: introduce wlr_output_event_commit output-power-management-v1: listen to output commit examples/dmabuf-capture: add extra roundtrip for wl_output listener backend/session/libseat: register log handler backend: remove check for _WAYLAND_DISPLAY backend/libinput: improve logger callback render: define EGL_NO_PLATFORM_SPECIFIC_TYPES (#2452) backend/drm: fix "a page-flip is already pending" errors on modeset xwayland: minor code style fixes xwayland: log unhandled NET_WM_STATE property changes gamma-control-v1: apply gamma LUT when output gets enabled screencopy: stop setting needs_frame flag backend/drm: export pending FB in export_dmabuf, if any output: update docs to reflect reality output: add when field to wlr_output_event_commit export-dmabuf: export DMA-BUF on output commit screencopy: perform DMA-BUF copy on output commit screencopy: send failed when copying a DMA-BUF with a region input-method: send modifiers in set_keyboard Update version to 0.12.0 Tobias Langendorf (1): xwm: add support for xwayland minimize Tudor Brindus (11): examples: use `perror` instead of `fprintf` GNU %m `printf` extension xwayland: using %m in `wlr_log` is broken, use `wlr_log_errno` instead xwayland: fix use-after-free in selection handling xwayland: introduce WLR_XWAYLAND for specifying which Xwayland to use xwayland: remove stale transfers from the same requestor xwayland: notify requestor when we fail to respond to their request xwayland: fix minor typo in debug log types/wlr_keyboard: use bitmasks for wlr_keyboard_led and wlr_keyboard_modifier enums types/wlr_output_layout: use bitmask for wlr_direction util/edges: use bitmask for wlr_edges render/dmabuf: use bitmask for wlr_dmabuf_attributes_flags Valentin (2): Use fixed size integer type Fix undefined behavior nerdopolis (1): Accommodate for CONFIG_VT=0, all TTYs are in seat0, but not all seat0s have TTYs -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEENP+VJs/vDpejQOLkD9574OiPXkgFAl+n+t4ACgkQD9574OiP Xkg8TRAAopnm99XA7TE3w0UEDhXUBvlWB05fS6M4wiSNXjMp1ENW0O7PGtIbZt1Y /mbJQ8yAXbT0i5X7aE6iKTW8GjHoWpwaYCL3BrDb8A8Hl2s04pxSiLL2JMbHyb02 KsCjZSbCBGldmgYOaJZl9SM5TDSyYo8xwGprkRiqK8Nz/SL75+sR4Jf/iMfaP1Rx qu2o87z3B1DEX+dvf0UaStJSmAb5sBmEW0X8sj8jf6Iubwsxy0BjI00AoTa2TS7k U1h3QuHqFy65pVg9Hwe5jPsoKVN5UqFzZNFja+91fXcjohm4gRkrnPZHCXijAl5E +sNSkY0SjO1ci4KSRXRTzD9X7HfA2f4yGjDEjoKorop7kUVAHQeKfFbbrKEjoYao aJLCFCNjT2ednZJhteYXKEodYfQov6AEirPJtw+UEDe8JgLSDZJZtXnBXKBXEeFa BgEzkoQiKqA4J3ToEj2fWrNMLkjfnc99vGn3tso9wfVB93sfg8lX1L9BI9CklGuD je6inBDRTa/RmALe1IGE4Y2PwrlmtQqHVjqDKv5MDpy65ffuYS3bH18fSLTW2cWY zYQmFOuj1VHxqT1noKAqTeowR691KC7JmAG2RjOZK2huP1xkijdaOVCA4bWlEqS3 zld5pUUJ4k30UJmJIUK1Vp9eCStnPvxti1ngfuLHZ6WCe/jT8Os= =2poj -----END PGP SIGNATURE----- Merge tag '0.12.0' into color-profiles wlroots 0.12.0 Antonin Décimo (3): Fix typos Fix incorrect format parameters xwayland: free server in error path Daniel De Graaf (1): wlr_virtual_keyboard: fix fd leak Daniel Kondor (2): foreign-toplevel-management: report parent toplevel foreign toplevel: send parent event only to clients that support it Devin J. Pohly (1): drm: fix uninitialized read Drew DeVault (1): Remove xdg-shell v6 Guido Cella (1): render: Don't crash on 0 dimensions Ilia Bozhinov (9): xwayland: do not allow apps to change focus after wlroots request make sure to fail setting gamma on disabled outputs backend/wayland: destroy relative pointer when output is disconnected wayland: emit relative pointer events only for current pointer xwayland: disconnect display destroy listener even if xwayland didn't initialize xwayland: add set_geometry event backend/wayland: add touch support to the wayland backend xdg_shell: fix a typo xdg_shell: handle inert popups Isaac Freund (6): xdg-shell: split last-acked and current state layer-shell: add for_each_popup layer-shell: error on 0 dimension without anchors xdg_positioner: remove unused field wlr_drag: remove unused point_destroy field xwayland: remove unused listener Kenny Levinsen (2): session: Add libseat backend session: Add missing init to direct-freebsd Marten Ringwelski (1): backend/drm: Check if output is enabled before sending frame event Mykola Orliuk (5): backend/wayland: manage cursor for current pointer backend/wayland: factor out wlr_wl_seat backend/wayland: add error flow in create_wl_seat backend/wayland: fix input creation error handling backend/wayland: fix some keyboard/touch leaks Patrick Steinhardt (1): session: Don't refuse unprivileged creation of "direct" backend Roman Gilg (3): output-management-v1: add head identifying events output-management-v1: send head identifying information output-management-v1: send complete head state on enable change Ronan Pigott (1): virtual_pointer: remember current axis for axis events Rouven Czerwinski (2): examples: remove unnecessary gles2.h imports xwm: add loop detection for read_surface_parent Ryan Walklin (4): Implement logind session SetType method to change session type to wayland Also set XDG_SESSION_TYPE Don't set XDG_SESSION_TYPE unless logind SetType succeeds Quieten failure to set login session type Scott Moreau (2): xwm: Set _NET_WM_STATE_FOCUSED property for the focused surface foreign toplevel: Fix whitespace error Simon Ser (31): xwayland/xwm: don't insert surface in list on error xwayland/xwm: add prop count assert in xsurface_set_net_wm_state xwayland/xwm: use initializer for props in xsurface_set_wm_state render/gles2: make wlr_gles2_texture_from_* private render/gles2: keep ref to wlr_gles2_renderer in wlr_gles2_texture render/gles2: make push/pop debug functions take a wlr_renderer render/gles2: remove gles2_procs gamma-control-v1: fix use-after-free in gamma_control_handle_set_gamma examples/simple: use wlr_output_preferred_mode examples/simple: use wlr_renderer instead of GL Remove unnecessary wl_display_dispatch calls output: introduce wlr_output_event_commit output-power-management-v1: listen to output commit examples/dmabuf-capture: add extra roundtrip for wl_output listener backend/session/libseat: register log handler backend: remove check for _WAYLAND_DISPLAY backend/libinput: improve logger callback render: define EGL_NO_PLATFORM_SPECIFIC_TYPES (#2452) backend/drm: fix "a page-flip is already pending" errors on modeset xwayland: minor code style fixes xwayland: log unhandled NET_WM_STATE property changes gamma-control-v1: apply gamma LUT when output gets enabled screencopy: stop setting needs_frame flag backend/drm: export pending FB in export_dmabuf, if any output: update docs to reflect reality output: add when field to wlr_output_event_commit export-dmabuf: export DMA-BUF on output commit screencopy: perform DMA-BUF copy on output commit screencopy: send failed when copying a DMA-BUF with a region input-method: send modifiers in set_keyboard Update version to 0.12.0 Tobias Langendorf (1): xwm: add support for xwayland minimize Tudor Brindus (11): examples: use `perror` instead of `fprintf` GNU %m `printf` extension xwayland: using %m in `wlr_log` is broken, use `wlr_log_errno` instead xwayland: fix use-after-free in selection handling xwayland: introduce WLR_XWAYLAND for specifying which Xwayland to use xwayland: remove stale transfers from the same requestor xwayland: notify requestor when we fail to respond to their request xwayland: fix minor typo in debug log types/wlr_keyboard: use bitmasks for wlr_keyboard_led and wlr_keyboard_modifier enums types/wlr_output_layout: use bitmask for wlr_direction util/edges: use bitmask for wlr_edges render/dmabuf: use bitmask for wlr_dmabuf_attributes_flags Valentin (2): Use fixed size integer type Fix undefined behavior nerdopolis (1): Accommodate for CONFIG_VT=0, all TTYs are in seat0, but not all seat0s have TTYs
2021-01-21 17:39:54 +01:00
static bool build_tex_shader(struct wlr_gles2_renderer *renderer, struct wlr_gles2_tex_shader *shader)
2020-07-14 17:01:25 +00:00
{
GLuint prog;
char fragsrc[100000] = "";
int n = snprintf(fragsrc, sizeof(fragsrc), "%s\n%s\nvoid main() {\n%s\n}\n",
shader->head,
shader->util,
shader->main);
assert(n < (int)sizeof(fragsrc));
wlroots 0.12.0 Antonin Décimo (3): Fix typos Fix incorrect format parameters xwayland: free server in error path Daniel De Graaf (1): wlr_virtual_keyboard: fix fd leak Daniel Kondor (2): foreign-toplevel-management: report parent toplevel foreign toplevel: send parent event only to clients that support it Devin J. Pohly (1): drm: fix uninitialized read Drew DeVault (1): Remove xdg-shell v6 Guido Cella (1): render: Don't crash on 0 dimensions Ilia Bozhinov (9): xwayland: do not allow apps to change focus after wlroots request make sure to fail setting gamma on disabled outputs backend/wayland: destroy relative pointer when output is disconnected wayland: emit relative pointer events only for current pointer xwayland: disconnect display destroy listener even if xwayland didn't initialize xwayland: add set_geometry event backend/wayland: add touch support to the wayland backend xdg_shell: fix a typo xdg_shell: handle inert popups Isaac Freund (6): xdg-shell: split last-acked and current state layer-shell: add for_each_popup layer-shell: error on 0 dimension without anchors xdg_positioner: remove unused field wlr_drag: remove unused point_destroy field xwayland: remove unused listener Kenny Levinsen (2): session: Add libseat backend session: Add missing init to direct-freebsd Marten Ringwelski (1): backend/drm: Check if output is enabled before sending frame event Mykola Orliuk (5): backend/wayland: manage cursor for current pointer backend/wayland: factor out wlr_wl_seat backend/wayland: add error flow in create_wl_seat backend/wayland: fix input creation error handling backend/wayland: fix some keyboard/touch leaks Patrick Steinhardt (1): session: Don't refuse unprivileged creation of "direct" backend Roman Gilg (3): output-management-v1: add head identifying events output-management-v1: send head identifying information output-management-v1: send complete head state on enable change Ronan Pigott (1): virtual_pointer: remember current axis for axis events Rouven Czerwinski (2): examples: remove unnecessary gles2.h imports xwm: add loop detection for read_surface_parent Ryan Walklin (4): Implement logind session SetType method to change session type to wayland Also set XDG_SESSION_TYPE Don't set XDG_SESSION_TYPE unless logind SetType succeeds Quieten failure to set login session type Scott Moreau (2): xwm: Set _NET_WM_STATE_FOCUSED property for the focused surface foreign toplevel: Fix whitespace error Simon Ser (31): xwayland/xwm: don't insert surface in list on error xwayland/xwm: add prop count assert in xsurface_set_net_wm_state xwayland/xwm: use initializer for props in xsurface_set_wm_state render/gles2: make wlr_gles2_texture_from_* private render/gles2: keep ref to wlr_gles2_renderer in wlr_gles2_texture render/gles2: make push/pop debug functions take a wlr_renderer render/gles2: remove gles2_procs gamma-control-v1: fix use-after-free in gamma_control_handle_set_gamma examples/simple: use wlr_output_preferred_mode examples/simple: use wlr_renderer instead of GL Remove unnecessary wl_display_dispatch calls output: introduce wlr_output_event_commit output-power-management-v1: listen to output commit examples/dmabuf-capture: add extra roundtrip for wl_output listener backend/session/libseat: register log handler backend: remove check for _WAYLAND_DISPLAY backend/libinput: improve logger callback render: define EGL_NO_PLATFORM_SPECIFIC_TYPES (#2452) backend/drm: fix "a page-flip is already pending" errors on modeset xwayland: minor code style fixes xwayland: log unhandled NET_WM_STATE property changes gamma-control-v1: apply gamma LUT when output gets enabled screencopy: stop setting needs_frame flag backend/drm: export pending FB in export_dmabuf, if any output: update docs to reflect reality output: add when field to wlr_output_event_commit export-dmabuf: export DMA-BUF on output commit screencopy: perform DMA-BUF copy on output commit screencopy: send failed when copying a DMA-BUF with a region input-method: send modifiers in set_keyboard Update version to 0.12.0 Tobias Langendorf (1): xwm: add support for xwayland minimize Tudor Brindus (11): examples: use `perror` instead of `fprintf` GNU %m `printf` extension xwayland: using %m in `wlr_log` is broken, use `wlr_log_errno` instead xwayland: fix use-after-free in selection handling xwayland: introduce WLR_XWAYLAND for specifying which Xwayland to use xwayland: remove stale transfers from the same requestor xwayland: notify requestor when we fail to respond to their request xwayland: fix minor typo in debug log types/wlr_keyboard: use bitmasks for wlr_keyboard_led and wlr_keyboard_modifier enums types/wlr_output_layout: use bitmask for wlr_direction util/edges: use bitmask for wlr_edges render/dmabuf: use bitmask for wlr_dmabuf_attributes_flags Valentin (2): Use fixed size integer type Fix undefined behavior nerdopolis (1): Accommodate for CONFIG_VT=0, all TTYs are in seat0, but not all seat0s have TTYs -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEENP+VJs/vDpejQOLkD9574OiPXkgFAl+n+t4ACgkQD9574OiP Xkg8TRAAopnm99XA7TE3w0UEDhXUBvlWB05fS6M4wiSNXjMp1ENW0O7PGtIbZt1Y /mbJQ8yAXbT0i5X7aE6iKTW8GjHoWpwaYCL3BrDb8A8Hl2s04pxSiLL2JMbHyb02 KsCjZSbCBGldmgYOaJZl9SM5TDSyYo8xwGprkRiqK8Nz/SL75+sR4Jf/iMfaP1Rx qu2o87z3B1DEX+dvf0UaStJSmAb5sBmEW0X8sj8jf6Iubwsxy0BjI00AoTa2TS7k U1h3QuHqFy65pVg9Hwe5jPsoKVN5UqFzZNFja+91fXcjohm4gRkrnPZHCXijAl5E +sNSkY0SjO1ci4KSRXRTzD9X7HfA2f4yGjDEjoKorop7kUVAHQeKfFbbrKEjoYao aJLCFCNjT2ednZJhteYXKEodYfQov6AEirPJtw+UEDe8JgLSDZJZtXnBXKBXEeFa BgEzkoQiKqA4J3ToEj2fWrNMLkjfnc99vGn3tso9wfVB93sfg8lX1L9BI9CklGuD je6inBDRTa/RmALe1IGE4Y2PwrlmtQqHVjqDKv5MDpy65ffuYS3bH18fSLTW2cWY zYQmFOuj1VHxqT1noKAqTeowR691KC7JmAG2RjOZK2huP1xkijdaOVCA4bWlEqS3 zld5pUUJ4k30UJmJIUK1Vp9eCStnPvxti1ngfuLHZ6WCe/jT8Os= =2poj -----END PGP SIGNATURE----- Merge tag '0.12.0' into color-profiles wlroots 0.12.0 Antonin Décimo (3): Fix typos Fix incorrect format parameters xwayland: free server in error path Daniel De Graaf (1): wlr_virtual_keyboard: fix fd leak Daniel Kondor (2): foreign-toplevel-management: report parent toplevel foreign toplevel: send parent event only to clients that support it Devin J. Pohly (1): drm: fix uninitialized read Drew DeVault (1): Remove xdg-shell v6 Guido Cella (1): render: Don't crash on 0 dimensions Ilia Bozhinov (9): xwayland: do not allow apps to change focus after wlroots request make sure to fail setting gamma on disabled outputs backend/wayland: destroy relative pointer when output is disconnected wayland: emit relative pointer events only for current pointer xwayland: disconnect display destroy listener even if xwayland didn't initialize xwayland: add set_geometry event backend/wayland: add touch support to the wayland backend xdg_shell: fix a typo xdg_shell: handle inert popups Isaac Freund (6): xdg-shell: split last-acked and current state layer-shell: add for_each_popup layer-shell: error on 0 dimension without anchors xdg_positioner: remove unused field wlr_drag: remove unused point_destroy field xwayland: remove unused listener Kenny Levinsen (2): session: Add libseat backend session: Add missing init to direct-freebsd Marten Ringwelski (1): backend/drm: Check if output is enabled before sending frame event Mykola Orliuk (5): backend/wayland: manage cursor for current pointer backend/wayland: factor out wlr_wl_seat backend/wayland: add error flow in create_wl_seat backend/wayland: fix input creation error handling backend/wayland: fix some keyboard/touch leaks Patrick Steinhardt (1): session: Don't refuse unprivileged creation of "direct" backend Roman Gilg (3): output-management-v1: add head identifying events output-management-v1: send head identifying information output-management-v1: send complete head state on enable change Ronan Pigott (1): virtual_pointer: remember current axis for axis events Rouven Czerwinski (2): examples: remove unnecessary gles2.h imports xwm: add loop detection for read_surface_parent Ryan Walklin (4): Implement logind session SetType method to change session type to wayland Also set XDG_SESSION_TYPE Don't set XDG_SESSION_TYPE unless logind SetType succeeds Quieten failure to set login session type Scott Moreau (2): xwm: Set _NET_WM_STATE_FOCUSED property for the focused surface foreign toplevel: Fix whitespace error Simon Ser (31): xwayland/xwm: don't insert surface in list on error xwayland/xwm: add prop count assert in xsurface_set_net_wm_state xwayland/xwm: use initializer for props in xsurface_set_wm_state render/gles2: make wlr_gles2_texture_from_* private render/gles2: keep ref to wlr_gles2_renderer in wlr_gles2_texture render/gles2: make push/pop debug functions take a wlr_renderer render/gles2: remove gles2_procs gamma-control-v1: fix use-after-free in gamma_control_handle_set_gamma examples/simple: use wlr_output_preferred_mode examples/simple: use wlr_renderer instead of GL Remove unnecessary wl_display_dispatch calls output: introduce wlr_output_event_commit output-power-management-v1: listen to output commit examples/dmabuf-capture: add extra roundtrip for wl_output listener backend/session/libseat: register log handler backend: remove check for _WAYLAND_DISPLAY backend/libinput: improve logger callback render: define EGL_NO_PLATFORM_SPECIFIC_TYPES (#2452) backend/drm: fix "a page-flip is already pending" errors on modeset xwayland: minor code style fixes xwayland: log unhandled NET_WM_STATE property changes gamma-control-v1: apply gamma LUT when output gets enabled screencopy: stop setting needs_frame flag backend/drm: export pending FB in export_dmabuf, if any output: update docs to reflect reality output: add when field to wlr_output_event_commit export-dmabuf: export DMA-BUF on output commit screencopy: perform DMA-BUF copy on output commit screencopy: send failed when copying a DMA-BUF with a region input-method: send modifiers in set_keyboard Update version to 0.12.0 Tobias Langendorf (1): xwm: add support for xwayland minimize Tudor Brindus (11): examples: use `perror` instead of `fprintf` GNU %m `printf` extension xwayland: using %m in `wlr_log` is broken, use `wlr_log_errno` instead xwayland: fix use-after-free in selection handling xwayland: introduce WLR_XWAYLAND for specifying which Xwayland to use xwayland: remove stale transfers from the same requestor xwayland: notify requestor when we fail to respond to their request xwayland: fix minor typo in debug log types/wlr_keyboard: use bitmasks for wlr_keyboard_led and wlr_keyboard_modifier enums types/wlr_output_layout: use bitmask for wlr_direction util/edges: use bitmask for wlr_edges render/dmabuf: use bitmask for wlr_dmabuf_attributes_flags Valentin (2): Use fixed size integer type Fix undefined behavior nerdopolis (1): Accommodate for CONFIG_VT=0, all TTYs are in seat0, but not all seat0s have TTYs
2021-01-21 17:39:54 +01:00
shader->program = prog = link_program(renderer, tex_vertex_src, fragsrc);
2020-07-14 17:01:25 +00:00
if (!prog) {
return false;
}
shader->proj = glGetUniformLocation(prog, "proj");
shader->invert_y = glGetUniformLocation(prog, "invert_y");
shader->tex = glGetUniformLocation(prog, "tex");
shader->alpha = glGetUniformLocation(prog, "alpha");
shader->pos_attrib = glGetAttribLocation(prog, "pos");
shader->tex_attrib = glGetAttribLocation(prog, "texcoord");
shader->color_table = glGetUniformLocation(prog, "color_table");
shader->color_enable = glGetUniformLocation(prog, "color_enable");
return true;
}
2018-03-31 18:49:43 -04:00
struct wlr_renderer *wlr_gles2_renderer_create(struct wlr_egl *egl) {
if (!wlr_egl_make_current(egl, EGL_NO_SURFACE, NULL)) {
return NULL;
}
const char *exts_str = (const char *)glGetString(GL_EXTENSIONS);
if (exts_str == NULL) {
wlr_log(WLR_ERROR, "Failed to get GL_EXTENSIONS");
return NULL;
}
struct wlr_gles2_renderer *renderer =
calloc(1, sizeof(struct wlr_gles2_renderer));
if (renderer == NULL) {
return NULL;
}
wlr_renderer_init(&renderer->wlr_renderer, &renderer_impl);
2017-10-22 10:20:26 +13:00
2018-03-31 18:49:43 -04:00
renderer->egl = egl;
renderer->exts_str = exts_str;
2018-07-09 22:49:54 +01:00
wlr_log(WLR_INFO, "Using %s", glGetString(GL_VERSION));
wlr_log(WLR_INFO, "GL vendor: %s", glGetString(GL_VENDOR));
wlr_log(WLR_INFO, "GL renderer: %s", glGetString(GL_RENDERER));
wlr_log(WLR_INFO, "Supported GLES2 extensions: %s", exts_str);
2018-03-27 17:02:48 -04:00
2020-07-14 17:01:25 +00:00
color_engine_setup();
if (!check_gl_ext(exts_str, "GL_EXT_texture_format_BGRA8888")) {
wlr_log(WLR_ERROR, "BGRA8888 format not supported by GLES2");
free(renderer);
return NULL;
}
renderer->exts.read_format_bgra_ext =
check_gl_ext(exts_str, "GL_EXT_read_format_bgra");
if (check_gl_ext(exts_str, "GL_KHR_debug")) {
renderer->exts.debug_khr = true;
load_gl_proc(&renderer->procs.glDebugMessageCallbackKHR,
"glDebugMessageCallbackKHR");
load_gl_proc(&renderer->procs.glDebugMessageControlKHR,
"glDebugMessageControlKHR");
}
if (check_gl_ext(exts_str, "GL_OES_EGL_image_external")) {
renderer->exts.egl_image_external_oes = true;
load_gl_proc(&renderer->procs.glEGLImageTargetTexture2DOES,
"glEGLImageTargetTexture2DOES");
}
2020-04-22 23:23:56 +00:00
if (check_gl_ext(exts_str, "GL_OES_EGL_image")) {
renderer->exts.egl_image_oes = true;
load_gl_proc(&renderer->procs.glEGLImageTargetRenderbufferStorageOES,
2020-04-22 23:23:56 +00:00
"glEGLImageTargetRenderbufferStorageOES");
}
if (renderer->exts.debug_khr) {
glEnable(GL_DEBUG_OUTPUT_KHR);
glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS_KHR);
renderer->procs.glDebugMessageCallbackKHR(gles2_log, NULL);
// Silence unwanted message types
renderer->procs.glDebugMessageControlKHR(GL_DONT_CARE,
GL_DEBUG_TYPE_POP_GROUP_KHR, GL_DONT_CARE, 0, NULL, GL_FALSE);
renderer->procs.glDebugMessageControlKHR(GL_DONT_CARE,
GL_DEBUG_TYPE_PUSH_GROUP_KHR, GL_DONT_CARE, 0, NULL, GL_FALSE);
}
push_gles2_debug(renderer);
GLuint prog;
renderer->shaders.quad.program = prog =
link_program(renderer, quad_vertex_src, quad_fragment_src);
if (!renderer->shaders.quad.program) {
goto error;
}
renderer->shaders.quad.proj = glGetUniformLocation(prog, "proj");
renderer->shaders.quad.color = glGetUniformLocation(prog, "color");
renderer->shaders.quad.pos_attrib = glGetAttribLocation(prog, "pos");
renderer->shaders.ellipse.program = prog =
link_program(renderer, quad_vertex_src, ellipse_fragment_src);
if (!renderer->shaders.ellipse.program) {
goto error;
}
renderer->shaders.ellipse.proj = glGetUniformLocation(prog, "proj");
renderer->shaders.ellipse.color = glGetUniformLocation(prog, "color");
renderer->shaders.ellipse.pos_attrib = glGetAttribLocation(prog, "pos");
renderer->shaders.ellipse.tex_attrib = glGetAttribLocation(prog, "texcoord");
2020-07-14 17:01:25 +00:00
renderer->shaders.tex_rgba = tex_fragment_src_rgba;
wlroots 0.12.0 Antonin Décimo (3): Fix typos Fix incorrect format parameters xwayland: free server in error path Daniel De Graaf (1): wlr_virtual_keyboard: fix fd leak Daniel Kondor (2): foreign-toplevel-management: report parent toplevel foreign toplevel: send parent event only to clients that support it Devin J. Pohly (1): drm: fix uninitialized read Drew DeVault (1): Remove xdg-shell v6 Guido Cella (1): render: Don't crash on 0 dimensions Ilia Bozhinov (9): xwayland: do not allow apps to change focus after wlroots request make sure to fail setting gamma on disabled outputs backend/wayland: destroy relative pointer when output is disconnected wayland: emit relative pointer events only for current pointer xwayland: disconnect display destroy listener even if xwayland didn't initialize xwayland: add set_geometry event backend/wayland: add touch support to the wayland backend xdg_shell: fix a typo xdg_shell: handle inert popups Isaac Freund (6): xdg-shell: split last-acked and current state layer-shell: add for_each_popup layer-shell: error on 0 dimension without anchors xdg_positioner: remove unused field wlr_drag: remove unused point_destroy field xwayland: remove unused listener Kenny Levinsen (2): session: Add libseat backend session: Add missing init to direct-freebsd Marten Ringwelski (1): backend/drm: Check if output is enabled before sending frame event Mykola Orliuk (5): backend/wayland: manage cursor for current pointer backend/wayland: factor out wlr_wl_seat backend/wayland: add error flow in create_wl_seat backend/wayland: fix input creation error handling backend/wayland: fix some keyboard/touch leaks Patrick Steinhardt (1): session: Don't refuse unprivileged creation of "direct" backend Roman Gilg (3): output-management-v1: add head identifying events output-management-v1: send head identifying information output-management-v1: send complete head state on enable change Ronan Pigott (1): virtual_pointer: remember current axis for axis events Rouven Czerwinski (2): examples: remove unnecessary gles2.h imports xwm: add loop detection for read_surface_parent Ryan Walklin (4): Implement logind session SetType method to change session type to wayland Also set XDG_SESSION_TYPE Don't set XDG_SESSION_TYPE unless logind SetType succeeds Quieten failure to set login session type Scott Moreau (2): xwm: Set _NET_WM_STATE_FOCUSED property for the focused surface foreign toplevel: Fix whitespace error Simon Ser (31): xwayland/xwm: don't insert surface in list on error xwayland/xwm: add prop count assert in xsurface_set_net_wm_state xwayland/xwm: use initializer for props in xsurface_set_wm_state render/gles2: make wlr_gles2_texture_from_* private render/gles2: keep ref to wlr_gles2_renderer in wlr_gles2_texture render/gles2: make push/pop debug functions take a wlr_renderer render/gles2: remove gles2_procs gamma-control-v1: fix use-after-free in gamma_control_handle_set_gamma examples/simple: use wlr_output_preferred_mode examples/simple: use wlr_renderer instead of GL Remove unnecessary wl_display_dispatch calls output: introduce wlr_output_event_commit output-power-management-v1: listen to output commit examples/dmabuf-capture: add extra roundtrip for wl_output listener backend/session/libseat: register log handler backend: remove check for _WAYLAND_DISPLAY backend/libinput: improve logger callback render: define EGL_NO_PLATFORM_SPECIFIC_TYPES (#2452) backend/drm: fix "a page-flip is already pending" errors on modeset xwayland: minor code style fixes xwayland: log unhandled NET_WM_STATE property changes gamma-control-v1: apply gamma LUT when output gets enabled screencopy: stop setting needs_frame flag backend/drm: export pending FB in export_dmabuf, if any output: update docs to reflect reality output: add when field to wlr_output_event_commit export-dmabuf: export DMA-BUF on output commit screencopy: perform DMA-BUF copy on output commit screencopy: send failed when copying a DMA-BUF with a region input-method: send modifiers in set_keyboard Update version to 0.12.0 Tobias Langendorf (1): xwm: add support for xwayland minimize Tudor Brindus (11): examples: use `perror` instead of `fprintf` GNU %m `printf` extension xwayland: using %m in `wlr_log` is broken, use `wlr_log_errno` instead xwayland: fix use-after-free in selection handling xwayland: introduce WLR_XWAYLAND for specifying which Xwayland to use xwayland: remove stale transfers from the same requestor xwayland: notify requestor when we fail to respond to their request xwayland: fix minor typo in debug log types/wlr_keyboard: use bitmasks for wlr_keyboard_led and wlr_keyboard_modifier enums types/wlr_output_layout: use bitmask for wlr_direction util/edges: use bitmask for wlr_edges render/dmabuf: use bitmask for wlr_dmabuf_attributes_flags Valentin (2): Use fixed size integer type Fix undefined behavior nerdopolis (1): Accommodate for CONFIG_VT=0, all TTYs are in seat0, but not all seat0s have TTYs -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEENP+VJs/vDpejQOLkD9574OiPXkgFAl+n+t4ACgkQD9574OiP Xkg8TRAAopnm99XA7TE3w0UEDhXUBvlWB05fS6M4wiSNXjMp1ENW0O7PGtIbZt1Y /mbJQ8yAXbT0i5X7aE6iKTW8GjHoWpwaYCL3BrDb8A8Hl2s04pxSiLL2JMbHyb02 KsCjZSbCBGldmgYOaJZl9SM5TDSyYo8xwGprkRiqK8Nz/SL75+sR4Jf/iMfaP1Rx qu2o87z3B1DEX+dvf0UaStJSmAb5sBmEW0X8sj8jf6Iubwsxy0BjI00AoTa2TS7k U1h3QuHqFy65pVg9Hwe5jPsoKVN5UqFzZNFja+91fXcjohm4gRkrnPZHCXijAl5E +sNSkY0SjO1ci4KSRXRTzD9X7HfA2f4yGjDEjoKorop7kUVAHQeKfFbbrKEjoYao aJLCFCNjT2ednZJhteYXKEodYfQov6AEirPJtw+UEDe8JgLSDZJZtXnBXKBXEeFa BgEzkoQiKqA4J3ToEj2fWrNMLkjfnc99vGn3tso9wfVB93sfg8lX1L9BI9CklGuD je6inBDRTa/RmALe1IGE4Y2PwrlmtQqHVjqDKv5MDpy65ffuYS3bH18fSLTW2cWY zYQmFOuj1VHxqT1noKAqTeowR691KC7JmAG2RjOZK2huP1xkijdaOVCA4bWlEqS3 zld5pUUJ4k30UJmJIUK1Vp9eCStnPvxti1ngfuLHZ6WCe/jT8Os= =2poj -----END PGP SIGNATURE----- Merge tag '0.12.0' into color-profiles wlroots 0.12.0 Antonin Décimo (3): Fix typos Fix incorrect format parameters xwayland: free server in error path Daniel De Graaf (1): wlr_virtual_keyboard: fix fd leak Daniel Kondor (2): foreign-toplevel-management: report parent toplevel foreign toplevel: send parent event only to clients that support it Devin J. Pohly (1): drm: fix uninitialized read Drew DeVault (1): Remove xdg-shell v6 Guido Cella (1): render: Don't crash on 0 dimensions Ilia Bozhinov (9): xwayland: do not allow apps to change focus after wlroots request make sure to fail setting gamma on disabled outputs backend/wayland: destroy relative pointer when output is disconnected wayland: emit relative pointer events only for current pointer xwayland: disconnect display destroy listener even if xwayland didn't initialize xwayland: add set_geometry event backend/wayland: add touch support to the wayland backend xdg_shell: fix a typo xdg_shell: handle inert popups Isaac Freund (6): xdg-shell: split last-acked and current state layer-shell: add for_each_popup layer-shell: error on 0 dimension without anchors xdg_positioner: remove unused field wlr_drag: remove unused point_destroy field xwayland: remove unused listener Kenny Levinsen (2): session: Add libseat backend session: Add missing init to direct-freebsd Marten Ringwelski (1): backend/drm: Check if output is enabled before sending frame event Mykola Orliuk (5): backend/wayland: manage cursor for current pointer backend/wayland: factor out wlr_wl_seat backend/wayland: add error flow in create_wl_seat backend/wayland: fix input creation error handling backend/wayland: fix some keyboard/touch leaks Patrick Steinhardt (1): session: Don't refuse unprivileged creation of "direct" backend Roman Gilg (3): output-management-v1: add head identifying events output-management-v1: send head identifying information output-management-v1: send complete head state on enable change Ronan Pigott (1): virtual_pointer: remember current axis for axis events Rouven Czerwinski (2): examples: remove unnecessary gles2.h imports xwm: add loop detection for read_surface_parent Ryan Walklin (4): Implement logind session SetType method to change session type to wayland Also set XDG_SESSION_TYPE Don't set XDG_SESSION_TYPE unless logind SetType succeeds Quieten failure to set login session type Scott Moreau (2): xwm: Set _NET_WM_STATE_FOCUSED property for the focused surface foreign toplevel: Fix whitespace error Simon Ser (31): xwayland/xwm: don't insert surface in list on error xwayland/xwm: add prop count assert in xsurface_set_net_wm_state xwayland/xwm: use initializer for props in xsurface_set_wm_state render/gles2: make wlr_gles2_texture_from_* private render/gles2: keep ref to wlr_gles2_renderer in wlr_gles2_texture render/gles2: make push/pop debug functions take a wlr_renderer render/gles2: remove gles2_procs gamma-control-v1: fix use-after-free in gamma_control_handle_set_gamma examples/simple: use wlr_output_preferred_mode examples/simple: use wlr_renderer instead of GL Remove unnecessary wl_display_dispatch calls output: introduce wlr_output_event_commit output-power-management-v1: listen to output commit examples/dmabuf-capture: add extra roundtrip for wl_output listener backend/session/libseat: register log handler backend: remove check for _WAYLAND_DISPLAY backend/libinput: improve logger callback render: define EGL_NO_PLATFORM_SPECIFIC_TYPES (#2452) backend/drm: fix "a page-flip is already pending" errors on modeset xwayland: minor code style fixes xwayland: log unhandled NET_WM_STATE property changes gamma-control-v1: apply gamma LUT when output gets enabled screencopy: stop setting needs_frame flag backend/drm: export pending FB in export_dmabuf, if any output: update docs to reflect reality output: add when field to wlr_output_event_commit export-dmabuf: export DMA-BUF on output commit screencopy: perform DMA-BUF copy on output commit screencopy: send failed when copying a DMA-BUF with a region input-method: send modifiers in set_keyboard Update version to 0.12.0 Tobias Langendorf (1): xwm: add support for xwayland minimize Tudor Brindus (11): examples: use `perror` instead of `fprintf` GNU %m `printf` extension xwayland: using %m in `wlr_log` is broken, use `wlr_log_errno` instead xwayland: fix use-after-free in selection handling xwayland: introduce WLR_XWAYLAND for specifying which Xwayland to use xwayland: remove stale transfers from the same requestor xwayland: notify requestor when we fail to respond to their request xwayland: fix minor typo in debug log types/wlr_keyboard: use bitmasks for wlr_keyboard_led and wlr_keyboard_modifier enums types/wlr_output_layout: use bitmask for wlr_direction util/edges: use bitmask for wlr_edges render/dmabuf: use bitmask for wlr_dmabuf_attributes_flags Valentin (2): Use fixed size integer type Fix undefined behavior nerdopolis (1): Accommodate for CONFIG_VT=0, all TTYs are in seat0, but not all seat0s have TTYs
2021-01-21 17:39:54 +01:00
if(! build_tex_shader(renderer, &renderer->shaders.tex_rgba)) {
goto error;
}
2020-07-14 17:01:25 +00:00
renderer->shaders.tex_rgbx = tex_fragment_src_rgbx;
wlroots 0.12.0 Antonin Décimo (3): Fix typos Fix incorrect format parameters xwayland: free server in error path Daniel De Graaf (1): wlr_virtual_keyboard: fix fd leak Daniel Kondor (2): foreign-toplevel-management: report parent toplevel foreign toplevel: send parent event only to clients that support it Devin J. Pohly (1): drm: fix uninitialized read Drew DeVault (1): Remove xdg-shell v6 Guido Cella (1): render: Don't crash on 0 dimensions Ilia Bozhinov (9): xwayland: do not allow apps to change focus after wlroots request make sure to fail setting gamma on disabled outputs backend/wayland: destroy relative pointer when output is disconnected wayland: emit relative pointer events only for current pointer xwayland: disconnect display destroy listener even if xwayland didn't initialize xwayland: add set_geometry event backend/wayland: add touch support to the wayland backend xdg_shell: fix a typo xdg_shell: handle inert popups Isaac Freund (6): xdg-shell: split last-acked and current state layer-shell: add for_each_popup layer-shell: error on 0 dimension without anchors xdg_positioner: remove unused field wlr_drag: remove unused point_destroy field xwayland: remove unused listener Kenny Levinsen (2): session: Add libseat backend session: Add missing init to direct-freebsd Marten Ringwelski (1): backend/drm: Check if output is enabled before sending frame event Mykola Orliuk (5): backend/wayland: manage cursor for current pointer backend/wayland: factor out wlr_wl_seat backend/wayland: add error flow in create_wl_seat backend/wayland: fix input creation error handling backend/wayland: fix some keyboard/touch leaks Patrick Steinhardt (1): session: Don't refuse unprivileged creation of "direct" backend Roman Gilg (3): output-management-v1: add head identifying events output-management-v1: send head identifying information output-management-v1: send complete head state on enable change Ronan Pigott (1): virtual_pointer: remember current axis for axis events Rouven Czerwinski (2): examples: remove unnecessary gles2.h imports xwm: add loop detection for read_surface_parent Ryan Walklin (4): Implement logind session SetType method to change session type to wayland Also set XDG_SESSION_TYPE Don't set XDG_SESSION_TYPE unless logind SetType succeeds Quieten failure to set login session type Scott Moreau (2): xwm: Set _NET_WM_STATE_FOCUSED property for the focused surface foreign toplevel: Fix whitespace error Simon Ser (31): xwayland/xwm: don't insert surface in list on error xwayland/xwm: add prop count assert in xsurface_set_net_wm_state xwayland/xwm: use initializer for props in xsurface_set_wm_state render/gles2: make wlr_gles2_texture_from_* private render/gles2: keep ref to wlr_gles2_renderer in wlr_gles2_texture render/gles2: make push/pop debug functions take a wlr_renderer render/gles2: remove gles2_procs gamma-control-v1: fix use-after-free in gamma_control_handle_set_gamma examples/simple: use wlr_output_preferred_mode examples/simple: use wlr_renderer instead of GL Remove unnecessary wl_display_dispatch calls output: introduce wlr_output_event_commit output-power-management-v1: listen to output commit examples/dmabuf-capture: add extra roundtrip for wl_output listener backend/session/libseat: register log handler backend: remove check for _WAYLAND_DISPLAY backend/libinput: improve logger callback render: define EGL_NO_PLATFORM_SPECIFIC_TYPES (#2452) backend/drm: fix "a page-flip is already pending" errors on modeset xwayland: minor code style fixes xwayland: log unhandled NET_WM_STATE property changes gamma-control-v1: apply gamma LUT when output gets enabled screencopy: stop setting needs_frame flag backend/drm: export pending FB in export_dmabuf, if any output: update docs to reflect reality output: add when field to wlr_output_event_commit export-dmabuf: export DMA-BUF on output commit screencopy: perform DMA-BUF copy on output commit screencopy: send failed when copying a DMA-BUF with a region input-method: send modifiers in set_keyboard Update version to 0.12.0 Tobias Langendorf (1): xwm: add support for xwayland minimize Tudor Brindus (11): examples: use `perror` instead of `fprintf` GNU %m `printf` extension xwayland: using %m in `wlr_log` is broken, use `wlr_log_errno` instead xwayland: fix use-after-free in selection handling xwayland: introduce WLR_XWAYLAND for specifying which Xwayland to use xwayland: remove stale transfers from the same requestor xwayland: notify requestor when we fail to respond to their request xwayland: fix minor typo in debug log types/wlr_keyboard: use bitmasks for wlr_keyboard_led and wlr_keyboard_modifier enums types/wlr_output_layout: use bitmask for wlr_direction util/edges: use bitmask for wlr_edges render/dmabuf: use bitmask for wlr_dmabuf_attributes_flags Valentin (2): Use fixed size integer type Fix undefined behavior nerdopolis (1): Accommodate for CONFIG_VT=0, all TTYs are in seat0, but not all seat0s have TTYs -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEENP+VJs/vDpejQOLkD9574OiPXkgFAl+n+t4ACgkQD9574OiP Xkg8TRAAopnm99XA7TE3w0UEDhXUBvlWB05fS6M4wiSNXjMp1ENW0O7PGtIbZt1Y /mbJQ8yAXbT0i5X7aE6iKTW8GjHoWpwaYCL3BrDb8A8Hl2s04pxSiLL2JMbHyb02 KsCjZSbCBGldmgYOaJZl9SM5TDSyYo8xwGprkRiqK8Nz/SL75+sR4Jf/iMfaP1Rx qu2o87z3B1DEX+dvf0UaStJSmAb5sBmEW0X8sj8jf6Iubwsxy0BjI00AoTa2TS7k U1h3QuHqFy65pVg9Hwe5jPsoKVN5UqFzZNFja+91fXcjohm4gRkrnPZHCXijAl5E +sNSkY0SjO1ci4KSRXRTzD9X7HfA2f4yGjDEjoKorop7kUVAHQeKfFbbrKEjoYao aJLCFCNjT2ednZJhteYXKEodYfQov6AEirPJtw+UEDe8JgLSDZJZtXnBXKBXEeFa BgEzkoQiKqA4J3ToEj2fWrNMLkjfnc99vGn3tso9wfVB93sfg8lX1L9BI9CklGuD je6inBDRTa/RmALe1IGE4Y2PwrlmtQqHVjqDKv5MDpy65ffuYS3bH18fSLTW2cWY zYQmFOuj1VHxqT1noKAqTeowR691KC7JmAG2RjOZK2huP1xkijdaOVCA4bWlEqS3 zld5pUUJ4k30UJmJIUK1Vp9eCStnPvxti1ngfuLHZ6WCe/jT8Os= =2poj -----END PGP SIGNATURE----- Merge tag '0.12.0' into color-profiles wlroots 0.12.0 Antonin Décimo (3): Fix typos Fix incorrect format parameters xwayland: free server in error path Daniel De Graaf (1): wlr_virtual_keyboard: fix fd leak Daniel Kondor (2): foreign-toplevel-management: report parent toplevel foreign toplevel: send parent event only to clients that support it Devin J. Pohly (1): drm: fix uninitialized read Drew DeVault (1): Remove xdg-shell v6 Guido Cella (1): render: Don't crash on 0 dimensions Ilia Bozhinov (9): xwayland: do not allow apps to change focus after wlroots request make sure to fail setting gamma on disabled outputs backend/wayland: destroy relative pointer when output is disconnected wayland: emit relative pointer events only for current pointer xwayland: disconnect display destroy listener even if xwayland didn't initialize xwayland: add set_geometry event backend/wayland: add touch support to the wayland backend xdg_shell: fix a typo xdg_shell: handle inert popups Isaac Freund (6): xdg-shell: split last-acked and current state layer-shell: add for_each_popup layer-shell: error on 0 dimension without anchors xdg_positioner: remove unused field wlr_drag: remove unused point_destroy field xwayland: remove unused listener Kenny Levinsen (2): session: Add libseat backend session: Add missing init to direct-freebsd Marten Ringwelski (1): backend/drm: Check if output is enabled before sending frame event Mykola Orliuk (5): backend/wayland: manage cursor for current pointer backend/wayland: factor out wlr_wl_seat backend/wayland: add error flow in create_wl_seat backend/wayland: fix input creation error handling backend/wayland: fix some keyboard/touch leaks Patrick Steinhardt (1): session: Don't refuse unprivileged creation of "direct" backend Roman Gilg (3): output-management-v1: add head identifying events output-management-v1: send head identifying information output-management-v1: send complete head state on enable change Ronan Pigott (1): virtual_pointer: remember current axis for axis events Rouven Czerwinski (2): examples: remove unnecessary gles2.h imports xwm: add loop detection for read_surface_parent Ryan Walklin (4): Implement logind session SetType method to change session type to wayland Also set XDG_SESSION_TYPE Don't set XDG_SESSION_TYPE unless logind SetType succeeds Quieten failure to set login session type Scott Moreau (2): xwm: Set _NET_WM_STATE_FOCUSED property for the focused surface foreign toplevel: Fix whitespace error Simon Ser (31): xwayland/xwm: don't insert surface in list on error xwayland/xwm: add prop count assert in xsurface_set_net_wm_state xwayland/xwm: use initializer for props in xsurface_set_wm_state render/gles2: make wlr_gles2_texture_from_* private render/gles2: keep ref to wlr_gles2_renderer in wlr_gles2_texture render/gles2: make push/pop debug functions take a wlr_renderer render/gles2: remove gles2_procs gamma-control-v1: fix use-after-free in gamma_control_handle_set_gamma examples/simple: use wlr_output_preferred_mode examples/simple: use wlr_renderer instead of GL Remove unnecessary wl_display_dispatch calls output: introduce wlr_output_event_commit output-power-management-v1: listen to output commit examples/dmabuf-capture: add extra roundtrip for wl_output listener backend/session/libseat: register log handler backend: remove check for _WAYLAND_DISPLAY backend/libinput: improve logger callback render: define EGL_NO_PLATFORM_SPECIFIC_TYPES (#2452) backend/drm: fix "a page-flip is already pending" errors on modeset xwayland: minor code style fixes xwayland: log unhandled NET_WM_STATE property changes gamma-control-v1: apply gamma LUT when output gets enabled screencopy: stop setting needs_frame flag backend/drm: export pending FB in export_dmabuf, if any output: update docs to reflect reality output: add when field to wlr_output_event_commit export-dmabuf: export DMA-BUF on output commit screencopy: perform DMA-BUF copy on output commit screencopy: send failed when copying a DMA-BUF with a region input-method: send modifiers in set_keyboard Update version to 0.12.0 Tobias Langendorf (1): xwm: add support for xwayland minimize Tudor Brindus (11): examples: use `perror` instead of `fprintf` GNU %m `printf` extension xwayland: using %m in `wlr_log` is broken, use `wlr_log_errno` instead xwayland: fix use-after-free in selection handling xwayland: introduce WLR_XWAYLAND for specifying which Xwayland to use xwayland: remove stale transfers from the same requestor xwayland: notify requestor when we fail to respond to their request xwayland: fix minor typo in debug log types/wlr_keyboard: use bitmasks for wlr_keyboard_led and wlr_keyboard_modifier enums types/wlr_output_layout: use bitmask for wlr_direction util/edges: use bitmask for wlr_edges render/dmabuf: use bitmask for wlr_dmabuf_attributes_flags Valentin (2): Use fixed size integer type Fix undefined behavior nerdopolis (1): Accommodate for CONFIG_VT=0, all TTYs are in seat0, but not all seat0s have TTYs
2021-01-21 17:39:54 +01:00
if(! build_tex_shader(renderer, &renderer->shaders.tex_rgbx)) {
goto error;
}
if (renderer->exts.egl_image_external_oes) {
2020-07-14 17:01:25 +00:00
renderer->shaders.tex_ext = tex_fragment_src_external;
wlroots 0.12.0 Antonin Décimo (3): Fix typos Fix incorrect format parameters xwayland: free server in error path Daniel De Graaf (1): wlr_virtual_keyboard: fix fd leak Daniel Kondor (2): foreign-toplevel-management: report parent toplevel foreign toplevel: send parent event only to clients that support it Devin J. Pohly (1): drm: fix uninitialized read Drew DeVault (1): Remove xdg-shell v6 Guido Cella (1): render: Don't crash on 0 dimensions Ilia Bozhinov (9): xwayland: do not allow apps to change focus after wlroots request make sure to fail setting gamma on disabled outputs backend/wayland: destroy relative pointer when output is disconnected wayland: emit relative pointer events only for current pointer xwayland: disconnect display destroy listener even if xwayland didn't initialize xwayland: add set_geometry event backend/wayland: add touch support to the wayland backend xdg_shell: fix a typo xdg_shell: handle inert popups Isaac Freund (6): xdg-shell: split last-acked and current state layer-shell: add for_each_popup layer-shell: error on 0 dimension without anchors xdg_positioner: remove unused field wlr_drag: remove unused point_destroy field xwayland: remove unused listener Kenny Levinsen (2): session: Add libseat backend session: Add missing init to direct-freebsd Marten Ringwelski (1): backend/drm: Check if output is enabled before sending frame event Mykola Orliuk (5): backend/wayland: manage cursor for current pointer backend/wayland: factor out wlr_wl_seat backend/wayland: add error flow in create_wl_seat backend/wayland: fix input creation error handling backend/wayland: fix some keyboard/touch leaks Patrick Steinhardt (1): session: Don't refuse unprivileged creation of "direct" backend Roman Gilg (3): output-management-v1: add head identifying events output-management-v1: send head identifying information output-management-v1: send complete head state on enable change Ronan Pigott (1): virtual_pointer: remember current axis for axis events Rouven Czerwinski (2): examples: remove unnecessary gles2.h imports xwm: add loop detection for read_surface_parent Ryan Walklin (4): Implement logind session SetType method to change session type to wayland Also set XDG_SESSION_TYPE Don't set XDG_SESSION_TYPE unless logind SetType succeeds Quieten failure to set login session type Scott Moreau (2): xwm: Set _NET_WM_STATE_FOCUSED property for the focused surface foreign toplevel: Fix whitespace error Simon Ser (31): xwayland/xwm: don't insert surface in list on error xwayland/xwm: add prop count assert in xsurface_set_net_wm_state xwayland/xwm: use initializer for props in xsurface_set_wm_state render/gles2: make wlr_gles2_texture_from_* private render/gles2: keep ref to wlr_gles2_renderer in wlr_gles2_texture render/gles2: make push/pop debug functions take a wlr_renderer render/gles2: remove gles2_procs gamma-control-v1: fix use-after-free in gamma_control_handle_set_gamma examples/simple: use wlr_output_preferred_mode examples/simple: use wlr_renderer instead of GL Remove unnecessary wl_display_dispatch calls output: introduce wlr_output_event_commit output-power-management-v1: listen to output commit examples/dmabuf-capture: add extra roundtrip for wl_output listener backend/session/libseat: register log handler backend: remove check for _WAYLAND_DISPLAY backend/libinput: improve logger callback render: define EGL_NO_PLATFORM_SPECIFIC_TYPES (#2452) backend/drm: fix "a page-flip is already pending" errors on modeset xwayland: minor code style fixes xwayland: log unhandled NET_WM_STATE property changes gamma-control-v1: apply gamma LUT when output gets enabled screencopy: stop setting needs_frame flag backend/drm: export pending FB in export_dmabuf, if any output: update docs to reflect reality output: add when field to wlr_output_event_commit export-dmabuf: export DMA-BUF on output commit screencopy: perform DMA-BUF copy on output commit screencopy: send failed when copying a DMA-BUF with a region input-method: send modifiers in set_keyboard Update version to 0.12.0 Tobias Langendorf (1): xwm: add support for xwayland minimize Tudor Brindus (11): examples: use `perror` instead of `fprintf` GNU %m `printf` extension xwayland: using %m in `wlr_log` is broken, use `wlr_log_errno` instead xwayland: fix use-after-free in selection handling xwayland: introduce WLR_XWAYLAND for specifying which Xwayland to use xwayland: remove stale transfers from the same requestor xwayland: notify requestor when we fail to respond to their request xwayland: fix minor typo in debug log types/wlr_keyboard: use bitmasks for wlr_keyboard_led and wlr_keyboard_modifier enums types/wlr_output_layout: use bitmask for wlr_direction util/edges: use bitmask for wlr_edges render/dmabuf: use bitmask for wlr_dmabuf_attributes_flags Valentin (2): Use fixed size integer type Fix undefined behavior nerdopolis (1): Accommodate for CONFIG_VT=0, all TTYs are in seat0, but not all seat0s have TTYs -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEENP+VJs/vDpejQOLkD9574OiPXkgFAl+n+t4ACgkQD9574OiP Xkg8TRAAopnm99XA7TE3w0UEDhXUBvlWB05fS6M4wiSNXjMp1ENW0O7PGtIbZt1Y /mbJQ8yAXbT0i5X7aE6iKTW8GjHoWpwaYCL3BrDb8A8Hl2s04pxSiLL2JMbHyb02 KsCjZSbCBGldmgYOaJZl9SM5TDSyYo8xwGprkRiqK8Nz/SL75+sR4Jf/iMfaP1Rx qu2o87z3B1DEX+dvf0UaStJSmAb5sBmEW0X8sj8jf6Iubwsxy0BjI00AoTa2TS7k U1h3QuHqFy65pVg9Hwe5jPsoKVN5UqFzZNFja+91fXcjohm4gRkrnPZHCXijAl5E +sNSkY0SjO1ci4KSRXRTzD9X7HfA2f4yGjDEjoKorop7kUVAHQeKfFbbrKEjoYao aJLCFCNjT2ednZJhteYXKEodYfQov6AEirPJtw+UEDe8JgLSDZJZtXnBXKBXEeFa BgEzkoQiKqA4J3ToEj2fWrNMLkjfnc99vGn3tso9wfVB93sfg8lX1L9BI9CklGuD je6inBDRTa/RmALe1IGE4Y2PwrlmtQqHVjqDKv5MDpy65ffuYS3bH18fSLTW2cWY zYQmFOuj1VHxqT1noKAqTeowR691KC7JmAG2RjOZK2huP1xkijdaOVCA4bWlEqS3 zld5pUUJ4k30UJmJIUK1Vp9eCStnPvxti1ngfuLHZ6WCe/jT8Os= =2poj -----END PGP SIGNATURE----- Merge tag '0.12.0' into color-profiles wlroots 0.12.0 Antonin Décimo (3): Fix typos Fix incorrect format parameters xwayland: free server in error path Daniel De Graaf (1): wlr_virtual_keyboard: fix fd leak Daniel Kondor (2): foreign-toplevel-management: report parent toplevel foreign toplevel: send parent event only to clients that support it Devin J. Pohly (1): drm: fix uninitialized read Drew DeVault (1): Remove xdg-shell v6 Guido Cella (1): render: Don't crash on 0 dimensions Ilia Bozhinov (9): xwayland: do not allow apps to change focus after wlroots request make sure to fail setting gamma on disabled outputs backend/wayland: destroy relative pointer when output is disconnected wayland: emit relative pointer events only for current pointer xwayland: disconnect display destroy listener even if xwayland didn't initialize xwayland: add set_geometry event backend/wayland: add touch support to the wayland backend xdg_shell: fix a typo xdg_shell: handle inert popups Isaac Freund (6): xdg-shell: split last-acked and current state layer-shell: add for_each_popup layer-shell: error on 0 dimension without anchors xdg_positioner: remove unused field wlr_drag: remove unused point_destroy field xwayland: remove unused listener Kenny Levinsen (2): session: Add libseat backend session: Add missing init to direct-freebsd Marten Ringwelski (1): backend/drm: Check if output is enabled before sending frame event Mykola Orliuk (5): backend/wayland: manage cursor for current pointer backend/wayland: factor out wlr_wl_seat backend/wayland: add error flow in create_wl_seat backend/wayland: fix input creation error handling backend/wayland: fix some keyboard/touch leaks Patrick Steinhardt (1): session: Don't refuse unprivileged creation of "direct" backend Roman Gilg (3): output-management-v1: add head identifying events output-management-v1: send head identifying information output-management-v1: send complete head state on enable change Ronan Pigott (1): virtual_pointer: remember current axis for axis events Rouven Czerwinski (2): examples: remove unnecessary gles2.h imports xwm: add loop detection for read_surface_parent Ryan Walklin (4): Implement logind session SetType method to change session type to wayland Also set XDG_SESSION_TYPE Don't set XDG_SESSION_TYPE unless logind SetType succeeds Quieten failure to set login session type Scott Moreau (2): xwm: Set _NET_WM_STATE_FOCUSED property for the focused surface foreign toplevel: Fix whitespace error Simon Ser (31): xwayland/xwm: don't insert surface in list on error xwayland/xwm: add prop count assert in xsurface_set_net_wm_state xwayland/xwm: use initializer for props in xsurface_set_wm_state render/gles2: make wlr_gles2_texture_from_* private render/gles2: keep ref to wlr_gles2_renderer in wlr_gles2_texture render/gles2: make push/pop debug functions take a wlr_renderer render/gles2: remove gles2_procs gamma-control-v1: fix use-after-free in gamma_control_handle_set_gamma examples/simple: use wlr_output_preferred_mode examples/simple: use wlr_renderer instead of GL Remove unnecessary wl_display_dispatch calls output: introduce wlr_output_event_commit output-power-management-v1: listen to output commit examples/dmabuf-capture: add extra roundtrip for wl_output listener backend/session/libseat: register log handler backend: remove check for _WAYLAND_DISPLAY backend/libinput: improve logger callback render: define EGL_NO_PLATFORM_SPECIFIC_TYPES (#2452) backend/drm: fix "a page-flip is already pending" errors on modeset xwayland: minor code style fixes xwayland: log unhandled NET_WM_STATE property changes gamma-control-v1: apply gamma LUT when output gets enabled screencopy: stop setting needs_frame flag backend/drm: export pending FB in export_dmabuf, if any output: update docs to reflect reality output: add when field to wlr_output_event_commit export-dmabuf: export DMA-BUF on output commit screencopy: perform DMA-BUF copy on output commit screencopy: send failed when copying a DMA-BUF with a region input-method: send modifiers in set_keyboard Update version to 0.12.0 Tobias Langendorf (1): xwm: add support for xwayland minimize Tudor Brindus (11): examples: use `perror` instead of `fprintf` GNU %m `printf` extension xwayland: using %m in `wlr_log` is broken, use `wlr_log_errno` instead xwayland: fix use-after-free in selection handling xwayland: introduce WLR_XWAYLAND for specifying which Xwayland to use xwayland: remove stale transfers from the same requestor xwayland: notify requestor when we fail to respond to their request xwayland: fix minor typo in debug log types/wlr_keyboard: use bitmasks for wlr_keyboard_led and wlr_keyboard_modifier enums types/wlr_output_layout: use bitmask for wlr_direction util/edges: use bitmask for wlr_edges render/dmabuf: use bitmask for wlr_dmabuf_attributes_flags Valentin (2): Use fixed size integer type Fix undefined behavior nerdopolis (1): Accommodate for CONFIG_VT=0, all TTYs are in seat0, but not all seat0s have TTYs
2021-01-21 17:39:54 +01:00
if(! build_tex_shader(renderer, &renderer->shaders.tex_ext)) {
goto error;
}
}
pop_gles2_debug(renderer);
2017-10-22 10:20:26 +13:00
wlr_egl_unset_current(renderer->egl);
2017-08-14 08:37:50 -04:00
return &renderer->wlr_renderer;
error:
glDeleteProgram(renderer->shaders.quad.program);
glDeleteProgram(renderer->shaders.ellipse.program);
glDeleteProgram(renderer->shaders.tex_rgba.program);
glDeleteProgram(renderer->shaders.tex_rgbx.program);
glDeleteProgram(renderer->shaders.tex_ext.program);
pop_gles2_debug(renderer);
if (renderer->exts.debug_khr) {
glDisable(GL_DEBUG_OUTPUT_KHR);
renderer->procs.glDebugMessageCallbackKHR(NULL, NULL);
}
wlr_egl_unset_current(renderer->egl);
free(renderer);
return NULL;
}
bool wlr_gles2_renderer_check_ext(struct wlr_renderer *wlr_renderer,
const char *ext) {
struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer);
return check_gl_ext(renderer->exts_str, ext);
}