alex/swayfx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: added support for external textures

Browse source
This commit is contained in:
Will McKinnon 2022-11-11 21:21:51 -05:00
parent 6ca742d4f2
commit 1a9f17054d
2 changed files with 43 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/sway/desktop/fx_renderer.h
View file

@ -2,6 +2,7 @@
#define _SWAY_OPENGL_H #define _SWAY_OPENGL_H
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
#include <stdbool.h> #include <stdbool.h>
enum corner_location { ALL, TOP_LEFT, TOP_RIGHT, BOTTOM_LEFT, BOTTOM_RIGHT }; enum corner_location { ALL, TOP_LEFT, TOP_RIGHT, BOTTOM_LEFT, BOTTOM_RIGHT };
@ -35,6 +36,15 @@ struct fx_renderer {
float projection[9]; float projection[9];
struct {
bool OES_egl_image_external;
} exts;
struct {
PFNGLEGLIMAGETARGETTEXTURE2DOESPROC glEGLImageTargetTexture2DOES;
} procs;
// Shaders // Shaders
struct { struct {
struct { struct {

37
sway/desktop/fx_renderer.c
View file

@ -120,6 +120,33 @@ bool init_rounded_quad_shader(struct rounded_quad_shader *shader, GLuint prog) {
return true; return true;
} }
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) {
sway_log(SWAY_ERROR, "GLES2 RENDERER: eglGetProcAddress(%s) failed", name);
abort();
}
*(void **)proc_ptr = proc;
}
struct fx_renderer *fx_renderer_create(struct wlr_egl *egl) { struct fx_renderer *fx_renderer_create(struct wlr_egl *egl) {
struct fx_renderer *renderer = calloc(1, sizeof(struct fx_renderer)); struct fx_renderer *renderer = calloc(1, sizeof(struct fx_renderer));
if (renderer == NULL) { if (renderer == NULL) {
@ -148,7 +175,12 @@ struct fx_renderer *fx_renderer_create(struct wlr_egl *egl) {
sway_log(SWAY_INFO, "GL renderer: %s", glGetString(GL_RENDERER)); sway_log(SWAY_INFO, "GL renderer: %s", glGetString(GL_RENDERER));
sway_log(SWAY_INFO, "Supported GLES2 extensions: %s", exts_str); sway_log(SWAY_INFO, "Supported GLES2 extensions: %s", exts_str);
// TODO: gl checks // TODO: the rest of the gl checks
if (check_gl_ext(exts_str, "GL_OES_EGL_image_external")) {
renderer->exts.OES_egl_image_external = true;
load_gl_proc(&renderer->procs.glEGLImageTargetTexture2DOES,
"glEGLImageTargetTexture2DOES");
}
// init shaders // init shaders
GLuint prog; GLuint prog;
@ -275,18 +307,15 @@ bool fx_render_subtexture_with_matrix(struct fx_renderer *renderer, struct wlr_t
shader = &renderer->shaders.tex_rgbx; shader = &renderer->shaders.tex_rgbx;
} }
break; break;
/*
case GL_TEXTURE_EXTERNAL_OES: case GL_TEXTURE_EXTERNAL_OES:
shader = &renderer->shaders.tex_ext; shader = &renderer->shaders.tex_ext;
// TODO: ADD ME ONCE EXTS ADDED TO RENDERER
if (!renderer->exts.OES_egl_image_external) { if (!renderer->exts.OES_egl_image_external) {
sway_log(SWAY_ERROR, "Failed to render texture: " sway_log(SWAY_ERROR, "Failed to render texture: "
"GL_TEXTURE_EXTERNAL_OES not supported"); "GL_TEXTURE_EXTERNAL_OES not supported");
return false; return false;
} }
break; break;
*/
default: default:
sway_log(SWAY_ERROR, "Aborting render"); sway_log(SWAY_ERROR, "Aborting render");
abort(); abort();