mirror of
https://gitlab.freedesktop.org/wlroots/wlroots.git
synced 2025-10-31 22:25:21 -04:00
Merge branch 'master' into screencontent
This commit is contained in:
commit
57548b557a
43 changed files with 886 additions and 375 deletions
177
render/egl.c
177
render/egl.c
|
|
@ -7,10 +7,6 @@
|
|||
#include <wlr/util/log.h>
|
||||
#include "glapi.h"
|
||||
|
||||
// Extension documentation
|
||||
// https://www.khronos.org/registry/EGL/extensions/KHR/EGL_KHR_image_base.txt.
|
||||
// https://cgit.freedesktop.org/mesa/mesa/tree/docs/specs/WL_bind_wayland_display.spec
|
||||
|
||||
static bool egl_get_config(EGLDisplay disp, EGLint *attribs, EGLConfig *out,
|
||||
EGLint visual_id) {
|
||||
EGLint count = 0, matched = 0, ret;
|
||||
|
|
@ -61,27 +57,27 @@ static void egl_log(EGLenum error, const char *command, EGLint msg_type,
|
|||
_wlr_log(egl_log_importance_to_wlr(msg_type), "[EGL] %s: %s", command, msg);
|
||||
}
|
||||
|
||||
static bool check_egl_ext(const char *egl_exts, const char *ext) {
|
||||
static bool check_egl_ext(const char *exts, const char *ext) {
|
||||
size_t extlen = strlen(ext);
|
||||
const char *end = egl_exts + strlen(egl_exts);
|
||||
const char *end = exts + strlen(exts);
|
||||
|
||||
while (egl_exts < end) {
|
||||
if (*egl_exts == ' ') {
|
||||
egl_exts++;
|
||||
while (exts < end) {
|
||||
if (*exts == ' ') {
|
||||
exts++;
|
||||
continue;
|
||||
}
|
||||
size_t n = strcspn(egl_exts, " ");
|
||||
if (n == extlen && strncmp(ext, egl_exts, n) == 0) {
|
||||
size_t n = strcspn(exts, " ");
|
||||
if (n == extlen && strncmp(ext, exts, n) == 0) {
|
||||
return true;
|
||||
}
|
||||
egl_exts += n;
|
||||
exts += n;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
static void print_dmabuf_formats(struct wlr_egl *egl) {
|
||||
/* Avoid log msg if extension is not present */
|
||||
if (!egl->egl_exts.dmabuf_import_modifiers) {
|
||||
if (!egl->exts.image_dmabuf_import_modifiers_ext) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -144,48 +140,88 @@ bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, void *remote_display,
|
|||
goto error;
|
||||
}
|
||||
|
||||
static const EGLint attribs[] = {EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE};
|
||||
|
||||
egl->context = eglCreateContext(egl->display, egl->config,
|
||||
EGL_NO_CONTEXT, attribs);
|
||||
|
||||
if (egl->context == EGL_NO_CONTEXT) {
|
||||
wlr_log(L_ERROR, "Failed to create EGL context");
|
||||
goto error;
|
||||
}
|
||||
|
||||
eglMakeCurrent(egl->display, EGL_NO_SURFACE, EGL_NO_SURFACE, egl->context);
|
||||
egl->exts_str = eglQueryString(egl->display, EGL_EXTENSIONS);
|
||||
|
||||
wlr_log(L_INFO, "Using EGL %d.%d", (int)major, (int)minor);
|
||||
wlr_log(L_INFO, "Supported EGL extensions: %s", egl->exts_str);
|
||||
wlr_log(L_INFO, "EGL vendor: %s", eglQueryString(egl->display, EGL_VENDOR));
|
||||
|
||||
if (!check_egl_ext(egl->exts_str, "EGL_KHR_image_base")) {
|
||||
wlr_log(L_ERROR, "Required EGL_KHR_image_base extension not supported");
|
||||
goto error;
|
||||
}
|
||||
egl->exts.image_base_khr =
|
||||
check_egl_ext(egl->exts_str, "EGL_KHR_image_base")
|
||||
&& eglCreateImageKHR && eglDestroyImageKHR;
|
||||
|
||||
egl->egl_exts.buffer_age =
|
||||
egl->exts.buffer_age_ext =
|
||||
check_egl_ext(egl->exts_str, "EGL_EXT_buffer_age");
|
||||
egl->egl_exts.swap_buffers_with_damage =
|
||||
check_egl_ext(egl->exts_str, "EGL_EXT_swap_buffers_with_damage") ||
|
||||
check_egl_ext(egl->exts_str, "EGL_KHR_swap_buffers_with_damage");
|
||||
egl->exts.swap_buffers_with_damage_ext =
|
||||
(check_egl_ext(egl->exts_str, "EGL_EXT_swap_buffers_with_damage") &&
|
||||
eglSwapBuffersWithDamageEXT);
|
||||
egl->exts.swap_buffers_with_damage_khr =
|
||||
(check_egl_ext(egl->exts_str, "EGL_KHR_swap_buffers_with_damage") &&
|
||||
eglSwapBuffersWithDamageKHR);
|
||||
|
||||
egl->egl_exts.dmabuf_import =
|
||||
egl->exts.image_dmabuf_import_ext =
|
||||
check_egl_ext(egl->exts_str, "EGL_EXT_image_dma_buf_import");
|
||||
egl->egl_exts.dmabuf_import_modifiers =
|
||||
egl->exts.image_dmabuf_import_modifiers_ext =
|
||||
check_egl_ext(egl->exts_str, "EGL_EXT_image_dma_buf_import_modifiers")
|
||||
&& eglQueryDmaBufFormatsEXT && eglQueryDmaBufModifiersEXT;
|
||||
|
||||
egl->egl_exts.dmabuf_export =
|
||||
check_egl_ext(egl->exts_str, "EGL_MESA_image_dma_buf_export");
|
||||
|
||||
egl->egl_exts.bind_wayland_display =
|
||||
check_egl_ext(egl->exts_str, "EGL_WL_bind_wayland_display");
|
||||
egl->exts.image_dma_buf_export_mesa =
|
||||
check_egl_ext(egl->exts_str, "EGL_MESA_image_dma_buf_export") &&
|
||||
eglExportDMABUFImageQueryMESA && eglExportDMABUFImageMESA;
|
||||
|
||||
print_dmabuf_formats(egl);
|
||||
|
||||
egl->exts.bind_wayland_display_wl =
|
||||
check_egl_ext(egl->exts_str, "EGL_WL_bind_wayland_display")
|
||||
&& eglBindWaylandDisplayWL && eglUnbindWaylandDisplayWL
|
||||
&& eglQueryWaylandBufferWL;
|
||||
|
||||
bool ext_context_priority =
|
||||
check_egl_ext(egl->exts_str, "EGL_IMG_context_priority");
|
||||
|
||||
size_t atti = 0;
|
||||
EGLint attribs[5];
|
||||
attribs[atti++] = EGL_CONTEXT_CLIENT_VERSION;
|
||||
attribs[atti++] = 2;
|
||||
|
||||
// On DRM, request a high priority context if possible
|
||||
bool request_high_priority = ext_context_priority &&
|
||||
platform == EGL_PLATFORM_GBM_MESA;
|
||||
|
||||
// Try to reschedule all of our rendering to be completed first. If it
|
||||
// fails, it will fallback to the default priority (MEDIUM).
|
||||
if (request_high_priority) {
|
||||
attribs[atti++] = EGL_CONTEXT_PRIORITY_LEVEL_IMG;
|
||||
attribs[atti++] = EGL_CONTEXT_PRIORITY_HIGH_IMG;
|
||||
}
|
||||
|
||||
attribs[atti++] = EGL_NONE;
|
||||
assert(atti <= sizeof(attribs)/sizeof(attribs[0]));
|
||||
|
||||
egl->context = eglCreateContext(egl->display, egl->config,
|
||||
EGL_NO_CONTEXT, attribs);
|
||||
if (egl->context == EGL_NO_CONTEXT) {
|
||||
wlr_log(L_ERROR, "Failed to create EGL context");
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (request_high_priority) {
|
||||
EGLint priority = EGL_CONTEXT_PRIORITY_MEDIUM_IMG;
|
||||
eglQueryContext(egl->display, egl->context,
|
||||
EGL_CONTEXT_PRIORITY_LEVEL_IMG, &priority);
|
||||
if (priority != EGL_CONTEXT_PRIORITY_HIGH_IMG) {
|
||||
wlr_log(L_INFO, "Failed to obtain a high priority context");
|
||||
} else {
|
||||
wlr_log(L_DEBUG, "Obtained high priority context");
|
||||
}
|
||||
}
|
||||
|
||||
if (!eglMakeCurrent(egl->display, EGL_NO_SURFACE, EGL_NO_SURFACE,
|
||||
egl->context)) {
|
||||
wlr_log(L_ERROR, "Failed to make EGL context current");
|
||||
goto error;
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
error:
|
||||
|
|
@ -203,7 +239,8 @@ void wlr_egl_finish(struct wlr_egl *egl) {
|
|||
}
|
||||
|
||||
eglMakeCurrent(egl->display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
|
||||
if (egl->wl_display && egl->egl_exts.bind_wayland_display) {
|
||||
if (egl->wl_display) {
|
||||
assert(egl->exts.bind_wayland_display_wl);
|
||||
eglUnbindWaylandDisplayWL(egl->display, egl->wl_display);
|
||||
}
|
||||
|
||||
|
|
@ -213,7 +250,7 @@ void wlr_egl_finish(struct wlr_egl *egl) {
|
|||
}
|
||||
|
||||
bool wlr_egl_bind_display(struct wlr_egl *egl, struct wl_display *local_display) {
|
||||
if (!egl->egl_exts.bind_wayland_display || !eglBindWaylandDisplayWL) {
|
||||
if (!egl->exts.bind_wayland_display_wl) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -226,7 +263,7 @@ bool wlr_egl_bind_display(struct wlr_egl *egl, struct wl_display *local_display)
|
|||
}
|
||||
|
||||
bool wlr_egl_destroy_image(struct wlr_egl *egl, EGLImage image) {
|
||||
if (!eglDestroyImageKHR) {
|
||||
if (!egl->exts.image_base_khr) {
|
||||
return false;
|
||||
}
|
||||
if (!image) {
|
||||
|
|
@ -247,7 +284,7 @@ EGLSurface wlr_egl_create_surface(struct wlr_egl *egl, void *window) {
|
|||
}
|
||||
|
||||
static int egl_get_buffer_age(struct wlr_egl *egl, EGLSurface surface) {
|
||||
if (!egl->egl_exts.buffer_age) {
|
||||
if (!egl->exts.buffer_age_ext) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
@ -282,7 +319,8 @@ bool wlr_egl_is_current(struct wlr_egl *egl) {
|
|||
bool wlr_egl_swap_buffers(struct wlr_egl *egl, EGLSurface surface,
|
||||
pixman_region32_t *damage) {
|
||||
EGLBoolean ret;
|
||||
if (damage != NULL && egl->egl_exts.swap_buffers_with_damage) {
|
||||
if (damage != NULL && (egl->exts.swap_buffers_with_damage_ext ||
|
||||
egl->exts.swap_buffers_with_damage_khr)) {
|
||||
int nrects;
|
||||
pixman_box32_t *rects =
|
||||
pixman_region32_rectangles(damage, &nrects);
|
||||
|
|
@ -294,8 +332,7 @@ bool wlr_egl_swap_buffers(struct wlr_egl *egl, EGLSurface surface,
|
|||
egl_damage[4*i + 3] = rects[i].y2 - rects[i].y1;
|
||||
}
|
||||
|
||||
assert(eglSwapBuffersWithDamageEXT || eglSwapBuffersWithDamageKHR);
|
||||
if (eglSwapBuffersWithDamageEXT) {
|
||||
if (egl->exts.swap_buffers_with_damage_ext) {
|
||||
ret = eglSwapBuffersWithDamageEXT(egl->display, surface, egl_damage,
|
||||
nrects);
|
||||
} else {
|
||||
|
|
@ -316,7 +353,7 @@ bool wlr_egl_swap_buffers(struct wlr_egl *egl, EGLSurface surface,
|
|||
EGLImageKHR wlr_egl_create_image_from_wl_drm(struct wlr_egl *egl,
|
||||
struct wl_resource *data, EGLint *fmt, int *width, int *height,
|
||||
bool *inverted_y) {
|
||||
if (!eglQueryWaylandBufferWL || !eglCreateImageKHR) {
|
||||
if (!egl->exts.bind_wayland_display_wl || !egl->exts.image_base_khr) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
@ -345,9 +382,13 @@ EGLImageKHR wlr_egl_create_image_from_wl_drm(struct wlr_egl *egl,
|
|||
|
||||
EGLImageKHR wlr_egl_create_image_from_dmabuf(struct wlr_egl *egl,
|
||||
struct wlr_dmabuf_attributes *attributes) {
|
||||
if (!egl->exts.image_base_khr) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
bool has_modifier = false;
|
||||
if (attributes->modifier != DRM_FORMAT_MOD_INVALID) {
|
||||
if (!egl->egl_exts.dmabuf_import_modifiers) {
|
||||
if (!egl->exts.image_dmabuf_import_modifiers_ext) {
|
||||
return NULL;
|
||||
}
|
||||
has_modifier = true;
|
||||
|
|
@ -417,39 +458,10 @@ EGLImageKHR wlr_egl_create_image_from_dmabuf(struct wlr_egl *egl,
|
|||
EGL_LINUX_DMA_BUF_EXT, NULL, attribs);
|
||||
}
|
||||
|
||||
#ifndef DRM_FORMAT_BIG_ENDIAN
|
||||
#define DRM_FORMAT_BIG_ENDIAN 0x80000000
|
||||
#endif
|
||||
bool wlr_egl_check_import_dmabuf(struct wlr_egl *egl,
|
||||
struct wlr_dmabuf_attributes *attribs) {
|
||||
switch (attribs->format & ~DRM_FORMAT_BIG_ENDIAN) {
|
||||
/* TODO: YUV based formats not yet supported, require multiple
|
||||
* wlr_create_image_from_dmabuf */
|
||||
case WL_SHM_FORMAT_YUYV:
|
||||
case WL_SHM_FORMAT_YVYU:
|
||||
case WL_SHM_FORMAT_UYVY:
|
||||
case WL_SHM_FORMAT_VYUY:
|
||||
case WL_SHM_FORMAT_AYUV:
|
||||
return false;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
EGLImage egl_image = wlr_egl_create_image_from_dmabuf(egl, attribs);
|
||||
if (egl_image) {
|
||||
/* We can import the image, good. No need to keep it
|
||||
since wlr_texture_upload_dmabuf will import it again */
|
||||
wlr_egl_destroy_image(egl, egl_image);
|
||||
return true;
|
||||
}
|
||||
/* TODO: import yuv dmabufs */
|
||||
return false;
|
||||
}
|
||||
|
||||
int wlr_egl_get_dmabuf_formats(struct wlr_egl *egl,
|
||||
int **formats) {
|
||||
if (!egl->egl_exts.dmabuf_import ||
|
||||
!egl->egl_exts.dmabuf_import_modifiers) {
|
||||
if (!egl->exts.image_dmabuf_import_ext ||
|
||||
!egl->exts.image_dmabuf_import_modifiers_ext) {
|
||||
wlr_log(L_DEBUG, "dmabuf extension not present");
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -476,8 +488,8 @@ int wlr_egl_get_dmabuf_formats(struct wlr_egl *egl,
|
|||
|
||||
int wlr_egl_get_dmabuf_modifiers(struct wlr_egl *egl,
|
||||
int format, uint64_t **modifiers) {
|
||||
if (!egl->egl_exts.dmabuf_import ||
|
||||
!egl->egl_exts.dmabuf_import_modifiers) {
|
||||
if (!egl->exts.image_dmabuf_import_ext ||
|
||||
!egl->exts.image_dmabuf_import_modifiers_ext) {
|
||||
wlr_log(L_DEBUG, "dmabuf extension not present");
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -509,8 +521,7 @@ bool wlr_egl_export_image_to_dmabuf(struct wlr_egl *egl, EGLImageKHR image,
|
|||
struct wlr_dmabuf_attributes *attribs) {
|
||||
memset(attribs, 0, sizeof(struct wlr_dmabuf_attributes));
|
||||
|
||||
if (!egl->egl_exts.dmabuf_export || !eglExportDMABUFImageQueryMESA ||
|
||||
!eglExportDMABUFImageMESA) {
|
||||
if (!egl->exts.image_dma_buf_export_mesa) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -118,18 +118,22 @@ static bool gles2_render_texture_with_matrix(struct wlr_renderer *wlr_renderer,
|
|||
struct wlr_gles2_texture *texture =
|
||||
get_gles2_texture_in_context(wlr_texture);
|
||||
|
||||
GLuint prog = 0;
|
||||
struct wlr_gles2_tex_shader *shader = NULL;
|
||||
GLenum target = 0;
|
||||
|
||||
switch (texture->type) {
|
||||
case WLR_GLES2_TEXTURE_GLTEX:
|
||||
case WLR_GLES2_TEXTURE_WL_DRM_GL:
|
||||
prog = texture->has_alpha ? renderer->shaders.tex_rgba :
|
||||
renderer->shaders.tex_rgbx;
|
||||
if (texture->has_alpha) {
|
||||
shader = &renderer->shaders.tex_rgba;
|
||||
} else {
|
||||
shader = &renderer->shaders.tex_rgbx;
|
||||
}
|
||||
target = GL_TEXTURE_2D;
|
||||
break;
|
||||
case WLR_GLES2_TEXTURE_WL_DRM_EXT:
|
||||
case WLR_GLES2_TEXTURE_DMABUF:
|
||||
prog = renderer->shaders.tex_ext;
|
||||
shader = &renderer->shaders.tex_ext;
|
||||
target = GL_TEXTURE_EXTERNAL_OES;
|
||||
break;
|
||||
}
|
||||
|
|
@ -149,11 +153,12 @@ static bool gles2_render_texture_with_matrix(struct wlr_renderer *wlr_renderer,
|
|||
glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
||||
glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
||||
|
||||
glUseProgram(prog);
|
||||
glUseProgram(shader->program);
|
||||
|
||||
glUniformMatrix3fv(0, 1, GL_FALSE, transposition);
|
||||
glUniform1i(1, texture->inverted_y);
|
||||
glUniform1f(3, alpha);
|
||||
glUniformMatrix3fv(shader->proj, 1, GL_FALSE, transposition);
|
||||
glUniform1i(shader->invert_y, texture->inverted_y);
|
||||
glUniform1i(shader->tex, 0);
|
||||
glUniform1f(shader->alpha, alpha);
|
||||
|
||||
draw_quad();
|
||||
|
||||
|
|
@ -173,9 +178,10 @@ static void gles2_render_quad_with_matrix(struct wlr_renderer *wlr_renderer,
|
|||
wlr_matrix_transpose(transposition, matrix);
|
||||
|
||||
PUSH_GLES2_DEBUG;
|
||||
glUseProgram(renderer->shaders.quad);
|
||||
glUniformMatrix3fv(0, 1, GL_FALSE, transposition);
|
||||
glUniform4f(1, color[0], color[1], color[2], color[3]);
|
||||
glUseProgram(renderer->shaders.quad.program);
|
||||
|
||||
glUniformMatrix3fv(renderer->shaders.quad.proj, 1, GL_FALSE, transposition);
|
||||
glUniform4f(renderer->shaders.quad.color, color[0], color[1], color[2], color[3]);
|
||||
draw_quad();
|
||||
POP_GLES2_DEBUG;
|
||||
}
|
||||
|
|
@ -191,9 +197,10 @@ static void gles2_render_ellipse_with_matrix(struct wlr_renderer *wlr_renderer,
|
|||
wlr_matrix_transpose(transposition, matrix);
|
||||
|
||||
PUSH_GLES2_DEBUG;
|
||||
glUseProgram(renderer->shaders.ellipse);
|
||||
glUniformMatrix3fv(0, 1, GL_FALSE, transposition);
|
||||
glUniform4f(1, color[0], color[1], color[2], color[3]);
|
||||
glUseProgram(renderer->shaders.ellipse.program);
|
||||
|
||||
glUniformMatrix3fv(renderer->shaders.ellipse.proj, 1, GL_FALSE, transposition);
|
||||
glUniform4f(renderer->shaders.ellipse.color, color[0], color[1], color[2], color[3]);
|
||||
draw_quad();
|
||||
POP_GLES2_DEBUG;
|
||||
}
|
||||
|
|
@ -242,12 +249,6 @@ static int gles2_get_dmabuf_modifiers(struct wlr_renderer *wlr_renderer,
|
|||
return wlr_egl_get_dmabuf_modifiers(renderer->egl, format, modifiers);
|
||||
}
|
||||
|
||||
static bool gles2_check_import_dmabuf(struct wlr_renderer *wlr_renderer,
|
||||
struct wlr_dmabuf_attributes *attribs) {
|
||||
struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer);
|
||||
return wlr_egl_check_import_dmabuf(renderer->egl, attribs);
|
||||
}
|
||||
|
||||
static bool gles2_read_pixels(struct wlr_renderer *wlr_renderer,
|
||||
enum wl_shm_format wl_fmt, uint32_t stride, uint32_t width,
|
||||
uint32_t height, uint32_t src_x, uint32_t src_y, uint32_t dst_x,
|
||||
|
|
@ -319,11 +320,11 @@ static void gles2_destroy(struct wlr_renderer *wlr_renderer) {
|
|||
wlr_egl_make_current(renderer->egl, EGL_NO_SURFACE, NULL);
|
||||
|
||||
PUSH_GLES2_DEBUG;
|
||||
glDeleteProgram(renderer->shaders.quad);
|
||||
glDeleteProgram(renderer->shaders.ellipse);
|
||||
glDeleteProgram(renderer->shaders.tex_rgba);
|
||||
glDeleteProgram(renderer->shaders.tex_rgbx);
|
||||
glDeleteProgram(renderer->shaders.tex_ext);
|
||||
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;
|
||||
|
||||
if (glDebugMessageCallbackKHR) {
|
||||
|
|
@ -348,7 +349,6 @@ static const struct wlr_renderer_impl renderer_impl = {
|
|||
.wl_drm_buffer_get_size = gles2_wl_drm_buffer_get_size,
|
||||
.get_dmabuf_formats = gles2_get_dmabuf_formats,
|
||||
.get_dmabuf_modifiers = gles2_get_dmabuf_modifiers,
|
||||
.check_import_dmabuf = gles2_check_import_dmabuf,
|
||||
.read_pixels = gles2_read_pixels,
|
||||
.format_supported = gles2_format_supported,
|
||||
.texture_from_pixels = gles2_texture_from_pixels,
|
||||
|
|
@ -493,31 +493,53 @@ struct wlr_renderer *wlr_gles2_renderer_create(struct wlr_egl *egl) {
|
|||
|
||||
PUSH_GLES2_DEBUG;
|
||||
|
||||
renderer->shaders.quad = link_program(quad_vertex_src, quad_fragment_src);
|
||||
if (!renderer->shaders.quad) {
|
||||
GLuint prog;
|
||||
renderer->shaders.quad.program = prog =
|
||||
link_program(quad_vertex_src, quad_fragment_src);
|
||||
if (!renderer->shaders.quad.program) {
|
||||
goto error;
|
||||
}
|
||||
renderer->shaders.ellipse =
|
||||
renderer->shaders.quad.proj = glGetUniformLocation(prog, "proj");
|
||||
renderer->shaders.quad.color = glGetUniformLocation(prog, "color");
|
||||
|
||||
renderer->shaders.ellipse.program = prog =
|
||||
link_program(quad_vertex_src, ellipse_fragment_src);
|
||||
if (!renderer->shaders.ellipse) {
|
||||
if (!renderer->shaders.ellipse.program) {
|
||||
goto error;
|
||||
}
|
||||
renderer->shaders.tex_rgba =
|
||||
renderer->shaders.ellipse.proj = glGetUniformLocation(prog, "proj");
|
||||
renderer->shaders.ellipse.color = glGetUniformLocation(prog, "color");
|
||||
|
||||
renderer->shaders.tex_rgba.program = prog =
|
||||
link_program(tex_vertex_src, tex_fragment_src_rgba);
|
||||
if (!renderer->shaders.tex_rgba) {
|
||||
if (!renderer->shaders.tex_rgba.program) {
|
||||
goto error;
|
||||
}
|
||||
renderer->shaders.tex_rgbx =
|
||||
renderer->shaders.tex_rgba.proj = glGetUniformLocation(prog, "proj");
|
||||
renderer->shaders.tex_rgba.invert_y = glGetUniformLocation(prog, "invert_y");
|
||||
renderer->shaders.tex_rgba.tex = glGetUniformLocation(prog, "tex");
|
||||
renderer->shaders.tex_rgba.alpha = glGetUniformLocation(prog, "alpha");
|
||||
|
||||
renderer->shaders.tex_rgbx.program = prog =
|
||||
link_program(tex_vertex_src, tex_fragment_src_rgbx);
|
||||
if (!renderer->shaders.tex_rgbx) {
|
||||
if (!renderer->shaders.tex_rgbx.program) {
|
||||
goto error;
|
||||
}
|
||||
renderer->shaders.tex_rgbx.proj = glGetUniformLocation(prog, "proj");
|
||||
renderer->shaders.tex_rgbx.invert_y = glGetUniformLocation(prog, "invert_y");
|
||||
renderer->shaders.tex_rgbx.tex = glGetUniformLocation(prog, "tex");
|
||||
renderer->shaders.tex_rgbx.alpha = glGetUniformLocation(prog, "alpha");
|
||||
|
||||
if (glEGLImageTargetTexture2DOES) {
|
||||
renderer->shaders.tex_ext =
|
||||
renderer->shaders.tex_ext.program = prog =
|
||||
link_program(tex_vertex_src, tex_fragment_src_external);
|
||||
if (!renderer->shaders.tex_ext) {
|
||||
if (!renderer->shaders.tex_ext.program) {
|
||||
goto error;
|
||||
}
|
||||
renderer->shaders.tex_ext.proj = glGetUniformLocation(prog, "proj");
|
||||
renderer->shaders.tex_ext.invert_y = glGetUniformLocation(prog, "invert_y");
|
||||
renderer->shaders.tex_ext.tex = glGetUniformLocation(prog, "tex");
|
||||
renderer->shaders.tex_ext.alpha = glGetUniformLocation(prog, "alpha");
|
||||
}
|
||||
|
||||
POP_GLES2_DEBUG;
|
||||
|
|
@ -525,11 +547,11 @@ struct wlr_renderer *wlr_gles2_renderer_create(struct wlr_egl *egl) {
|
|||
return &renderer->wlr_renderer;
|
||||
|
||||
error:
|
||||
glDeleteProgram(renderer->shaders.quad);
|
||||
glDeleteProgram(renderer->shaders.ellipse);
|
||||
glDeleteProgram(renderer->shaders.tex_rgba);
|
||||
glDeleteProgram(renderer->shaders.tex_rgbx);
|
||||
glDeleteProgram(renderer->shaders.tex_ext);
|
||||
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;
|
||||
|
||||
|
|
|
|||
|
|
@ -227,6 +227,10 @@ struct wlr_texture *wlr_gles2_texture_from_wl_drm(struct wlr_egl *egl,
|
|||
return &texture->wlr_texture;
|
||||
}
|
||||
|
||||
#ifndef DRM_FORMAT_BIG_ENDIAN
|
||||
#define DRM_FORMAT_BIG_ENDIAN 0x80000000
|
||||
#endif
|
||||
|
||||
struct wlr_texture *wlr_gles2_texture_from_dmabuf(struct wlr_egl *egl,
|
||||
struct wlr_dmabuf_attributes *attribs) {
|
||||
assert(wlr_egl_is_current(egl));
|
||||
|
|
@ -235,12 +239,24 @@ struct wlr_texture *wlr_gles2_texture_from_dmabuf(struct wlr_egl *egl,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
if (!egl->egl_exts.dmabuf_import) {
|
||||
if (!egl->exts.image_dmabuf_import_ext) {
|
||||
wlr_log(L_ERROR, "Cannot create DMA-BUF texture: EGL extension "
|
||||
"unavailable");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
switch (attribs->format & ~DRM_FORMAT_BIG_ENDIAN) {
|
||||
case WL_SHM_FORMAT_YUYV:
|
||||
case WL_SHM_FORMAT_YVYU:
|
||||
case WL_SHM_FORMAT_UYVY:
|
||||
case WL_SHM_FORMAT_VYUY:
|
||||
case WL_SHM_FORMAT_AYUV:
|
||||
// TODO: YUV based formats not yet supported, require multiple images
|
||||
return false;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
struct wlr_gles2_texture *texture =
|
||||
calloc(1, sizeof(struct wlr_gles2_texture));
|
||||
if (texture == NULL) {
|
||||
|
|
|
|||
|
|
@ -135,14 +135,6 @@ int wlr_renderer_get_dmabuf_modifiers(struct wlr_renderer *r, int format,
|
|||
return r->impl->get_dmabuf_modifiers(r, format, modifiers);
|
||||
}
|
||||
|
||||
bool wlr_renderer_check_import_dmabuf(struct wlr_renderer *r,
|
||||
struct wlr_dmabuf_attributes *attribs) {
|
||||
if (!r->impl->check_import_dmabuf) {
|
||||
return false;
|
||||
}
|
||||
return r->impl->check_import_dmabuf(r, attribs);
|
||||
}
|
||||
|
||||
bool wlr_renderer_read_pixels(struct wlr_renderer *r, enum wl_shm_format fmt,
|
||||
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,
|
||||
|
|
@ -187,8 +179,8 @@ void wlr_renderer_init_wl_display(struct wlr_renderer *r,
|
|||
}
|
||||
|
||||
struct wlr_renderer *wlr_renderer_autocreate(struct wlr_egl *egl,
|
||||
EGLenum platform, void *remote_display, EGLint *config_attribs, EGLint visual_id) {
|
||||
|
||||
EGLenum platform, void *remote_display, EGLint *config_attribs,
|
||||
EGLint visual_id) {
|
||||
if (!wlr_egl_init(egl, platform, remote_display, config_attribs, visual_id)) {
|
||||
wlr_log(L_ERROR, "Could not initialize EGL");
|
||||
return NULL;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue