BitHeaven
/
picom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gl_common: use a dummy pass to unify blur code paths 

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
This commit is contained in:
Yuxuan Shui 2019-07-24 23:55:31 +01:00
parent 4c9ded837f
commit 62878d7c57
No known key found for this signature in database
GPG Key ID: 37C999F617EA1A47
1 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/backend/gl/gl_common.c
View File

@ -383,11 +383,9 @@ bool gl_blur(backend_t *base, double opacity, void *ctx, const region_t *reg_blu
glBindTexture(GL_TEXTURE_2D, bctx->blur_texture[0]); glBindTexture(GL_TEXTURE_2D, bctx->blur_texture[0]);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, bctx->texture_width, glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, bctx->texture_width,
bctx->texture_height, 0, GL_BGRA, GL_UNSIGNED_BYTE, NULL); bctx->texture_height, 0, GL_BGRA, GL_UNSIGNED_BYTE, NULL);
if (bctx->npasses > 1) {
glBindTexture(GL_TEXTURE_2D, bctx->blur_texture[1]); glBindTexture(GL_TEXTURE_2D, bctx->blur_texture[1]);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, bctx->texture_width, glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, bctx->texture_width,
bctx->texture_height, 0, GL_BGRA, GL_UNSIGNED_BYTE, NULL); bctx->texture_height, 0, GL_BGRA, GL_UNSIGNED_BYTE, NULL);
}
// XXX: do we need projection matrix for blur at all? // XXX: do we need projection matrix for blur at all?
// Note: OpenGL matrices are column major // Note: OpenGL matrices are column major
@ -629,6 +627,14 @@ void gl_resize(struct gl_data *gd, int width, int height) {
} }
// clang-format off // clang-format off
static const char dummy_frag[] = GLSL(330,
uniform sampler2D tex;
in vec2 texcoord;
void main() {
gl_FragColor = texelFetch(tex, ivec2(texcoord.xy), 0);
}
);
static const char fill_frag[] = GLSL(330, static const char fill_frag[] = GLSL(330,
uniform vec4 color; uniform vec4 color;
void main() { void main() {
@ -771,20 +777,21 @@ void *gl_create_blur_context(backend_t *base, enum blur_method method, void *arg
return ctx; return ctx;
} }
int nkernels;
ctx->method = BLUR_METHOD_KERNEL; ctx->method = BLUR_METHOD_KERNEL;
if (method == BLUR_METHOD_KERNEL) { if (method == BLUR_METHOD_KERNEL) {
ctx->npasses = ((struct kernel_blur_args *)args)->kernel_count; nkernels = ((struct kernel_blur_args *)args)->kernel_count;
kernels = ((struct kernel_blur_args *)args)->kernels; kernels = ((struct kernel_blur_args *)args)->kernels;
} else { } else {
kernels = generate_blur_kernel(method, args, &ctx->npasses); kernels = generate_blur_kernel(method, args, &nkernels);
} }
if (!ctx->npasses) { if (!nkernels) {
ctx->method = BLUR_METHOD_NONE; ctx->method = BLUR_METHOD_NONE;
return ctx; return ctx;
} }
ctx->blur_shader = ccalloc(ctx->npasses, gl_blur_shader_t); ctx->blur_shader = ccalloc(max2(2, nkernels), gl_blur_shader_t);
char *lc_numeric_old = strdup(setlocale(LC_NUMERIC, NULL)); char *lc_numeric_old = strdup(setlocale(LC_NUMERIC, NULL));
// Enforce LC_NUMERIC locale "C" here to make sure decimal point is sane // Enforce LC_NUMERIC locale "C" here to make sure decimal point is sane
@ -813,7 +820,7 @@ void *gl_create_blur_context(backend_t *base, enum blur_method method, void *arg
const char *shader_add = FRAG_SHADER_BLUR_ADD; const char *shader_add = FRAG_SHADER_BLUR_ADD;
char *extension = strdup(""); char *extension = strdup("");
for (int i = 0; i < ctx->npasses; i++) { for (int i = 0; i < nkernels; i++) {
auto kern = kernels[i]; auto kern = kernels[i];
// Build shader // Build shader
int width = kern->w, height = kern->h; int width = kern->w, height = kern->h;
@ -866,12 +873,23 @@ void *gl_create_blur_context(backend_t *base, enum blur_method method, void *arg
ctx->resize_height += kern->h / 2; ctx->resize_height += kern->h / 2;
} }
// Texture size will be defined by gl_resize if (nkernels == 1) {
glGenTextures(ctx->npasses > 1 ? 2 : 1, ctx->blur_texture); // Generate an extra null pass so we don't need special code path for
// the single pass case
auto pass = &ctx->blur_shader[1];
pass->prog = gl_create_program_from_str(vertex_shader, dummy_frag);
pass->unifm_opacity = glGetUniformLocationChecked(pass->prog, "opacity");
pass->orig_loc = glGetUniformLocationChecked(pass->prog, "orig");
ctx->npasses = 2;
} else {
ctx->npasses = nkernels;
}
// Texture size will be defined by gl_blur
glGenTextures(2, ctx->blur_texture);
glBindTexture(GL_TEXTURE_2D, ctx->blur_texture[0]); glBindTexture(GL_TEXTURE_2D, ctx->blur_texture[0]);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
if (ctx->npasses > 1) {
glBindTexture(GL_TEXTURE_2D, ctx->blur_texture[1]); glBindTexture(GL_TEXTURE_2D, ctx->blur_texture[1]);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
@ -882,12 +900,11 @@ void *gl_create_blur_context(backend_t *base, enum blur_method method, void *arg
success = false; success = false;
goto out; goto out;
} }
}
out: out:
if (method != BLUR_METHOD_KERNEL) { if (method != BLUR_METHOD_KERNEL) {
// We generated the blur kernels, so we need to free them // We generated the blur kernels, so we need to free them
for (int i = 0; i < ctx->npasses; i++) { for (int i = 0; i < nkernels; i++) {
free(kernels[i]); free(kernels[i]);
} }
free(kernels); free(kernels);