mirror of
https://gitlab.freedesktop.org/wlroots/wlroots.git
synced 2026-04-19 06:47:02 -04:00
Merge branch 'pass' into 'master'
Draft: render: refactor render_pass See merge request wlroots/wlroots!5292
This commit is contained in:
YaoBing Xiao
commit
9a60741a89
32 changed files with 1950 additions and 340 deletions
|
|
@ -9,23 +9,30 @@
|
|||
#include "render/gles2.h"
|
||||
#include "util/matrix.h"
|
||||
|
||||
#include "common_vert_src.h"
|
||||
#include "quad_frag_src.h"
|
||||
#include "tex_rgba_frag_src.h"
|
||||
#include "tex_rgbx_frag_src.h"
|
||||
#include "tex_external_frag_src.h"
|
||||
|
||||
#define MAX_QUADS 86 // 4kb
|
||||
|
||||
static const struct wlr_render_pass_impl render_pass_impl;
|
||||
|
||||
static struct wlr_gles2_render_pass *get_render_pass(struct wlr_render_pass *wlr_pass) {
|
||||
struct wlr_gles2_render_pass *wlr_gles2_render_pass_from_render_pass(
|
||||
struct wlr_render_pass *wlr_pass) {
|
||||
assert(wlr_pass->impl == &render_pass_impl);
|
||||
struct wlr_gles2_render_pass *pass = wl_container_of(wlr_pass, pass, base);
|
||||
return pass;
|
||||
}
|
||||
|
||||
static bool render_pass_submit(struct wlr_render_pass *wlr_pass) {
|
||||
struct wlr_gles2_render_pass *pass = get_render_pass(wlr_pass);
|
||||
struct wlr_gles2_render_pass *pass = wlr_gles2_render_pass_from_render_pass(wlr_pass);
|
||||
struct wlr_gles2_renderer *renderer = pass->buffer->renderer;
|
||||
struct wlr_gles2_render_timer *timer = pass->timer;
|
||||
bool ok = false;
|
||||
|
||||
push_gles2_debug(renderer);
|
||||
wlr_gles2_push_debug(renderer);
|
||||
|
||||
if (timer) {
|
||||
// clear disjoint flag
|
||||
|
|
@ -65,7 +72,7 @@ static bool render_pass_submit(struct wlr_render_pass *wlr_pass) {
|
|||
out:
|
||||
glBindFramebuffer(GL_FRAMEBUFFER, 0);
|
||||
|
||||
pop_gles2_debug(renderer);
|
||||
wlr_gles2_pop_debug(renderer);
|
||||
wlr_egl_restore_context(&pass->prev_ctx);
|
||||
|
||||
wlr_drm_syncobj_timeline_unref(pass->signal_timeline);
|
||||
|
|
@ -124,7 +131,7 @@ static void render(const struct wlr_box *box, const pixman_region32_t *clip, GLi
|
|||
pixman_region32_fini(®ion);
|
||||
}
|
||||
|
||||
static void set_proj_matrix(GLint loc, float proj[9], const struct wlr_box *box) {
|
||||
void wlr_gles_set_proj_matrix(GLint loc, float proj[9], const struct wlr_box *box) {
|
||||
float gl_matrix[9];
|
||||
wlr_matrix_identity(gl_matrix);
|
||||
wlr_matrix_translate(gl_matrix, box->x, box->y);
|
||||
|
|
@ -166,25 +173,26 @@ static void setup_blending(enum wlr_render_blend_mode mode) {
|
|||
|
||||
static void render_pass_add_texture(struct wlr_render_pass *wlr_pass,
|
||||
const struct wlr_render_texture_options *options) {
|
||||
struct wlr_gles2_render_pass *pass = get_render_pass(wlr_pass);
|
||||
struct wlr_gles2_render_pass *pass = wlr_gles2_render_pass_from_render_pass(wlr_pass);
|
||||
struct wlr_gles2_renderer *renderer = pass->buffer->renderer;
|
||||
struct wlr_gles2_texture *texture = gles2_get_texture(options->texture);
|
||||
|
||||
struct wlr_gles2_render_texture_pass *texture_pass =
|
||||
wlr_gles2_render_texture_pass_from_pass(renderer->wlr_renderer.texture_pass);
|
||||
struct wlr_gles2_tex_shader *shader = NULL;
|
||||
|
||||
switch (texture->target) {
|
||||
case GL_TEXTURE_2D:
|
||||
if (texture->has_alpha) {
|
||||
shader = &renderer->shaders.tex_rgba;
|
||||
shader = &texture_pass->shaders.tex_rgba;
|
||||
} else {
|
||||
shader = &renderer->shaders.tex_rgbx;
|
||||
shader = &texture_pass->shaders.tex_rgbx;
|
||||
}
|
||||
break;
|
||||
case GL_TEXTURE_EXTERNAL_OES:
|
||||
// EGL_EXT_image_dma_buf_import_modifiers requires
|
||||
// GL_OES_EGL_image_external
|
||||
assert(renderer->exts.OES_egl_image_external);
|
||||
shader = &renderer->shaders.tex_ext;
|
||||
shader = &texture_pass->shaders.tex_ext;
|
||||
break;
|
||||
default:
|
||||
abort();
|
||||
|
|
@ -201,7 +209,7 @@ static void render_pass_add_texture(struct wlr_render_pass *wlr_pass,
|
|||
src_fbox.width /= options->texture->width;
|
||||
src_fbox.height /= options->texture->height;
|
||||
|
||||
push_gles2_debug(renderer);
|
||||
wlr_gles2_push_debug(renderer);
|
||||
|
||||
if (options->wait_timeline != NULL) {
|
||||
int sync_file_fd =
|
||||
|
|
@ -244,26 +252,28 @@ static void render_pass_add_texture(struct wlr_render_pass *wlr_pass,
|
|||
|
||||
glUniform1i(shader->tex, 0);
|
||||
glUniform1f(shader->alpha, alpha);
|
||||
set_proj_matrix(shader->proj, pass->projection_matrix, &dst_box);
|
||||
wlr_gles_set_proj_matrix(shader->proj, pass->projection_matrix, &dst_box);
|
||||
set_tex_matrix(shader->tex_proj, options->transform, &src_fbox);
|
||||
|
||||
render(&dst_box, options->clip, shader->pos_attrib);
|
||||
|
||||
glBindTexture(texture->target, 0);
|
||||
pop_gles2_debug(renderer);
|
||||
wlr_gles2_pop_debug(renderer);
|
||||
}
|
||||
|
||||
static void render_pass_add_rect(struct wlr_render_pass *wlr_pass,
|
||||
const struct wlr_render_rect_options *options) {
|
||||
struct wlr_gles2_render_pass *pass = get_render_pass(wlr_pass);
|
||||
struct wlr_gles2_render_pass *pass = wlr_gles2_render_pass_from_render_pass(wlr_pass);
|
||||
struct wlr_gles2_renderer *renderer = pass->buffer->renderer;
|
||||
struct wlr_gles2_render_rect_pass *rect_pass =
|
||||
wlr_gles2_render_rect_pass_from_pass(renderer->wlr_renderer.rect_pass);
|
||||
|
||||
const struct wlr_render_color *color = &options->color;
|
||||
struct wlr_box box;
|
||||
struct wlr_buffer *wlr_buffer = pass->buffer->buffer;
|
||||
wlr_render_rect_options_get_box(options, wlr_buffer, &box);
|
||||
|
||||
push_gles2_debug(renderer);
|
||||
wlr_gles2_push_debug(renderer);
|
||||
enum wlr_render_blend_mode blend_mode =
|
||||
color->a == 1.0 ? WLR_RENDER_BLEND_MODE_NONE : options->blend_mode;
|
||||
if (blend_mode == WLR_RENDER_BLEND_MODE_NONE &&
|
||||
|
|
@ -275,19 +285,29 @@ static void render_pass_add_rect(struct wlr_render_pass *wlr_pass,
|
|||
glClear(GL_COLOR_BUFFER_BIT);
|
||||
} else {
|
||||
setup_blending(blend_mode);
|
||||
glUseProgram(renderer->shaders.quad.program);
|
||||
set_proj_matrix(renderer->shaders.quad.proj, pass->projection_matrix, &box);
|
||||
glUniform4f(renderer->shaders.quad.color, color->r, color->g, color->b, color->a);
|
||||
render(&box, options->clip, renderer->shaders.quad.pos_attrib);
|
||||
glUseProgram(rect_pass->shader.program);
|
||||
wlr_gles_set_proj_matrix(rect_pass->shader.proj, pass->projection_matrix, &box);
|
||||
glUniform4f(rect_pass->shader.color, color->r, color->g, color->b, color->a);
|
||||
render(&box, options->clip, rect_pass->shader.pos_attrib);
|
||||
}
|
||||
|
||||
pop_gles2_debug(renderer);
|
||||
wlr_gles2_pop_debug(renderer);
|
||||
}
|
||||
|
||||
static void render_pass_destory(struct wlr_render_pass *wlr_pass) {
|
||||
(void)wlr_pass;
|
||||
}
|
||||
|
||||
static struct wlr_renderer *render_pass_get_renderer(struct wlr_render_pass *wlr_pass) {
|
||||
struct wlr_gles2_render_pass *pass = wlr_gles2_render_pass_from_render_pass(wlr_pass);
|
||||
struct wlr_gles2_renderer *renderer = pass->buffer->renderer;
|
||||
|
||||
return &renderer->wlr_renderer;
|
||||
}
|
||||
|
||||
static const struct wlr_render_pass_impl render_pass_impl = {
|
||||
.submit = render_pass_submit,
|
||||
.add_texture = render_pass_add_texture,
|
||||
.add_rect = render_pass_add_rect,
|
||||
.destroy = render_pass_destory,
|
||||
.get_renderer = render_pass_get_renderer,
|
||||
};
|
||||
|
||||
static const char *reset_status_str(GLenum status) {
|
||||
|
|
@ -341,13 +361,217 @@ struct wlr_gles2_render_pass *begin_gles2_buffer_pass(struct wlr_gles2_buffer *b
|
|||
matrix_projection(pass->projection_matrix, wlr_buffer->width, wlr_buffer->height,
|
||||
WL_OUTPUT_TRANSFORM_FLIPPED_180);
|
||||
|
||||
push_gles2_debug(renderer);
|
||||
wlr_gles2_push_debug(renderer);
|
||||
glBindFramebuffer(GL_FRAMEBUFFER, fbo);
|
||||
|
||||
glViewport(0, 0, wlr_buffer->width, wlr_buffer->height);
|
||||
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
|
||||
glDisable(GL_SCISSOR_TEST);
|
||||
pop_gles2_debug(renderer);
|
||||
wlr_gles2_pop_debug(renderer);
|
||||
|
||||
return pass;
|
||||
}
|
||||
|
||||
static void render_rect_pass_destroy(struct wlr_render_rect_pass *pass) {
|
||||
struct wlr_gles2_render_rect_pass *gles2_pass =
|
||||
wlr_gles2_render_rect_pass_from_pass(pass);
|
||||
wlr_gles2_push_debug(gles2_pass->renderer);
|
||||
glDeleteProgram(gles2_pass->shader.program);
|
||||
wlr_gles2_pop_debug(gles2_pass->renderer);
|
||||
free(gles2_pass);
|
||||
}
|
||||
|
||||
static const struct wlr_render_rect_pass_impl render_rect_pass_impl = {
|
||||
.destroy = render_rect_pass_destroy,
|
||||
.render = render_pass_add_rect,
|
||||
};
|
||||
|
||||
struct wlr_render_rect_pass *wlr_gles2_render_rect_pass_create(
|
||||
struct wlr_renderer *wlr_renderer) {
|
||||
struct wlr_gles2_render_rect_pass *pass = calloc(1, sizeof(*pass));
|
||||
if (pass == NULL) {
|
||||
wlr_log_errno(WLR_ERROR, "failed to allocate wlr_gles2_render_rect_pass");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
struct wlr_gles2_renderer *renderer = wlr_gles2_renderer_from_renderer(wlr_renderer);
|
||||
if (!wlr_egl_make_current(renderer->egl, NULL)) {
|
||||
free(pass);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
wlr_render_rect_pass_init(&pass->base, &render_rect_pass_impl);
|
||||
wlr_gles2_push_debug(renderer);
|
||||
GLuint prog;
|
||||
pass->shader.program = prog =
|
||||
wlr_gles2_link_program(renderer, common_vert_src, quad_frag_src);
|
||||
if (!pass->shader.program) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
pass->shader.proj = glGetUniformLocation(pass->shader.program, "proj");
|
||||
pass->shader.color = glGetUniformLocation(pass->shader.program, "color");
|
||||
pass->shader.pos_attrib = glGetAttribLocation(pass->shader.program, "pos");
|
||||
wlr_gles2_pop_debug(renderer);
|
||||
wlr_egl_unset_current(renderer->egl);
|
||||
pass->renderer = renderer;
|
||||
return &pass->base;
|
||||
|
||||
error:
|
||||
render_rect_pass_destroy(&pass->base);
|
||||
wlr_gles2_pop_debug(renderer);
|
||||
wlr_egl_unset_current(renderer->egl);
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
bool wlr_render_rect_pass_is_gles2(const struct wlr_render_rect_pass *rect_pass) {
|
||||
return rect_pass != NULL && rect_pass->impl == &render_rect_pass_impl;
|
||||
}
|
||||
|
||||
struct wlr_gles2_render_rect_pass *wlr_gles2_render_rect_pass_from_pass(
|
||||
struct wlr_render_rect_pass *rect_pass) {
|
||||
if (!wlr_render_rect_pass_is_gles2(rect_pass)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
struct wlr_gles2_render_rect_pass *pass =
|
||||
wl_container_of(rect_pass, pass, base);
|
||||
|
||||
return pass;
|
||||
}
|
||||
|
||||
static void render_texture_pass_destroy(struct wlr_render_texture_pass *pass) {
|
||||
struct wlr_gles2_render_texture_pass *gles2_pass =
|
||||
wlr_gles2_render_texture_pass_from_pass(pass);
|
||||
wlr_gles2_push_debug(gles2_pass->renderer);
|
||||
glDeleteProgram(gles2_pass->shaders.tex_rgba.program);
|
||||
glDeleteProgram(gles2_pass->shaders.tex_rgbx.program);
|
||||
glDeleteProgram(gles2_pass->shaders.tex_ext.program);
|
||||
wlr_gles2_pop_debug(gles2_pass->renderer);
|
||||
free(gles2_pass);
|
||||
}
|
||||
|
||||
static const struct wlr_render_texture_pass_impl render_texture_pass_impl = {
|
||||
.destroy = render_texture_pass_destroy,
|
||||
.render = render_pass_add_texture,
|
||||
};
|
||||
|
||||
struct wlr_render_texture_pass *wlr_gles2_render_texture_pass_create(
|
||||
struct wlr_renderer *wlr_renderer) {
|
||||
struct wlr_gles2_render_texture_pass *pass = calloc(1, sizeof(*pass));
|
||||
if (pass == NULL) {
|
||||
wlr_log_errno(WLR_ERROR, "failed to allocate wlr_gles2_render_texture_pass");
|
||||
return NULL;
|
||||
}
|
||||
wlr_render_texture_pass_init(&pass->base, &render_texture_pass_impl);
|
||||
struct wlr_gles2_renderer *renderer = wlr_gles2_renderer_from_renderer(wlr_renderer);
|
||||
if (!wlr_egl_make_current(renderer->egl, NULL)) {
|
||||
free(pass);
|
||||
return NULL;
|
||||
}
|
||||
wlr_gles2_push_debug(renderer);
|
||||
GLuint prog;
|
||||
pass->shaders.tex_rgba.program = prog =
|
||||
wlr_gles2_link_program(renderer, common_vert_src, tex_rgba_frag_src);
|
||||
if (!pass->shaders.tex_rgba.program) {
|
||||
goto error;
|
||||
}
|
||||
pass->shaders.tex_rgba.proj = glGetUniformLocation(prog, "proj");
|
||||
pass->shaders.tex_rgba.tex_proj = glGetUniformLocation(prog, "tex_proj");
|
||||
pass->shaders.tex_rgba.tex = glGetUniformLocation(prog, "tex");
|
||||
pass->shaders.tex_rgba.alpha = glGetUniformLocation(prog, "alpha");
|
||||
pass->shaders.tex_rgba.pos_attrib = glGetAttribLocation(prog, "pos");
|
||||
|
||||
pass->shaders.tex_rgbx.program = prog =
|
||||
wlr_gles2_link_program(renderer, common_vert_src, tex_rgbx_frag_src);
|
||||
if (!pass->shaders.tex_rgbx.program) {
|
||||
goto error;
|
||||
}
|
||||
pass->shaders.tex_rgbx.proj = glGetUniformLocation(prog, "proj");
|
||||
pass->shaders.tex_rgbx.tex_proj = glGetUniformLocation(prog, "tex_proj");
|
||||
pass->shaders.tex_rgbx.tex = glGetUniformLocation(prog, "tex");
|
||||
pass->shaders.tex_rgbx.alpha = glGetUniformLocation(prog, "alpha");
|
||||
pass->shaders.tex_rgbx.pos_attrib = glGetAttribLocation(prog, "pos");
|
||||
|
||||
if (renderer->exts.OES_egl_image_external) {
|
||||
pass->shaders.tex_ext.program = prog =
|
||||
wlr_gles2_link_program(renderer, common_vert_src, tex_external_frag_src);
|
||||
if (!pass->shaders.tex_ext.program) {
|
||||
goto error;
|
||||
}
|
||||
pass->shaders.tex_ext.proj = glGetUniformLocation(prog, "proj");
|
||||
pass->shaders.tex_ext.tex_proj = glGetUniformLocation(prog, "tex_proj");
|
||||
pass->shaders.tex_ext.tex = glGetUniformLocation(prog, "tex");
|
||||
pass->shaders.tex_ext.alpha = glGetUniformLocation(prog, "alpha");
|
||||
pass->shaders.tex_ext.pos_attrib = glGetAttribLocation(prog, "pos");
|
||||
}
|
||||
|
||||
wlr_gles2_pop_debug(renderer);
|
||||
|
||||
wlr_egl_unset_current(renderer->egl);
|
||||
pass->renderer = renderer;
|
||||
return &pass->base;
|
||||
|
||||
error:
|
||||
render_texture_pass_destroy(&pass->base);
|
||||
wlr_gles2_pop_debug(renderer);
|
||||
wlr_egl_unset_current(renderer->egl);
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
bool wlr_render_texture_pass_is_gles2(const struct wlr_render_texture_pass *texture_pass) {
|
||||
return texture_pass != NULL && texture_pass->impl == &render_texture_pass_impl;
|
||||
}
|
||||
|
||||
struct wlr_gles2_render_texture_pass *wlr_gles2_render_texture_pass_from_pass(
|
||||
struct wlr_render_texture_pass *texture_pass) {
|
||||
if (!wlr_render_texture_pass_is_gles2(texture_pass)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
struct wlr_gles2_render_texture_pass *pass =
|
||||
wl_container_of(texture_pass, pass, base);
|
||||
|
||||
return pass;
|
||||
}
|
||||
|
||||
static void render_submit_pass_destroy(struct wlr_render_submit_pass *pass) {
|
||||
struct wlr_gles2_render_submit_pass *gles2_pass =
|
||||
wlr_gles2_render_submit_pass_from_pass(pass);
|
||||
free(gles2_pass);
|
||||
}
|
||||
|
||||
static const struct wlr_render_submit_pass_impl gles2_render_submit_pass_impl = {
|
||||
.destroy = render_submit_pass_destroy,
|
||||
.render = render_pass_submit,
|
||||
};
|
||||
|
||||
struct wlr_render_submit_pass *wlr_gles2_render_submit_pass_create(void) {
|
||||
struct wlr_gles2_render_submit_pass *pass = calloc(1, sizeof(*pass));
|
||||
if (pass == NULL) {
|
||||
wlr_log_errno(WLR_ERROR, "failed to allocate wlr_gles2_render_submit_pass");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
wlr_render_submit_pass_init(&pass->base, &gles2_render_submit_pass_impl);
|
||||
|
||||
return &pass->base;
|
||||
}
|
||||
|
||||
bool wlr_render_submit_pass_is_gles2(const struct wlr_render_submit_pass *submit_pass) {
|
||||
return submit_pass->impl == &gles2_render_submit_pass_impl;
|
||||
}
|
||||
|
||||
struct wlr_gles2_render_submit_pass *wlr_gles2_render_submit_pass_from_pass(
|
||||
struct wlr_render_submit_pass *submit_pass) {
|
||||
if (!wlr_render_submit_pass_is_gles2(submit_pass)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
struct wlr_gles2_render_submit_pass *pass =
|
||||
wl_container_of(submit_pass, pass, base);
|
||||
|
||||
return pass;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,12 +20,6 @@
|
|||
#include "render/pixel_format.h"
|
||||
#include "util/time.h"
|
||||
|
||||
#include "common_vert_src.h"
|
||||
#include "quad_frag_src.h"
|
||||
#include "tex_rgba_frag_src.h"
|
||||
#include "tex_rgbx_frag_src.h"
|
||||
#include "tex_external_frag_src.h"
|
||||
|
||||
static const struct wlr_renderer_impl renderer_impl;
|
||||
static const struct wlr_render_timer_impl render_timer_impl;
|
||||
|
||||
|
|
@ -33,7 +27,7 @@ bool wlr_renderer_is_gles2(const struct wlr_renderer *wlr_renderer) {
|
|||
return wlr_renderer->impl == &renderer_impl;
|
||||
}
|
||||
|
||||
struct wlr_gles2_renderer *gles2_get_renderer(
|
||||
struct wlr_gles2_renderer *wlr_gles2_renderer_from_renderer(
|
||||
struct wlr_renderer *wlr_renderer) {
|
||||
assert(wlr_renderer_is_gles2(wlr_renderer));
|
||||
struct wlr_gles2_renderer *renderer = wl_container_of(wlr_renderer, renderer, wlr_renderer);
|
||||
|
|
@ -57,13 +51,13 @@ static void destroy_buffer(struct wlr_gles2_buffer *buffer) {
|
|||
struct wlr_egl_context prev_ctx;
|
||||
wlr_egl_make_current(buffer->renderer->egl, &prev_ctx);
|
||||
|
||||
push_gles2_debug(buffer->renderer);
|
||||
wlr_gles2_push_debug(buffer->renderer);
|
||||
|
||||
glDeleteFramebuffers(1, &buffer->fbo);
|
||||
glDeleteRenderbuffers(1, &buffer->rbo);
|
||||
glDeleteTextures(1, &buffer->tex);
|
||||
|
||||
pop_gles2_debug(buffer->renderer);
|
||||
wlr_gles2_pop_debug(buffer->renderer);
|
||||
|
||||
wlr_egl_destroy_image(buffer->renderer->egl, buffer->image);
|
||||
|
||||
|
|
@ -93,7 +87,7 @@ GLuint gles2_buffer_get_fbo(struct wlr_gles2_buffer *buffer) {
|
|||
return buffer->fbo;
|
||||
}
|
||||
|
||||
push_gles2_debug(buffer->renderer);
|
||||
wlr_gles2_push_debug(buffer->renderer);
|
||||
|
||||
if (!buffer->rbo) {
|
||||
glGenRenderbuffers(1, &buffer->rbo);
|
||||
|
|
@ -116,7 +110,7 @@ GLuint gles2_buffer_get_fbo(struct wlr_gles2_buffer *buffer) {
|
|||
buffer->fbo = 0;
|
||||
}
|
||||
|
||||
pop_gles2_debug(buffer->renderer);
|
||||
wlr_gles2_pop_debug(buffer->renderer);
|
||||
|
||||
return buffer->fbo;
|
||||
}
|
||||
|
|
@ -166,7 +160,7 @@ error_buffer:
|
|||
|
||||
static const struct wlr_drm_format_set *gles2_get_texture_formats(
|
||||
struct wlr_renderer *wlr_renderer, uint32_t buffer_caps) {
|
||||
struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer);
|
||||
struct wlr_gles2_renderer *renderer = wlr_gles2_renderer_from_renderer(wlr_renderer);
|
||||
if (buffer_caps & WLR_BUFFER_CAP_DMABUF) {
|
||||
return wlr_egl_get_dmabuf_texture_formats(renderer->egl);
|
||||
} else if (buffer_caps & WLR_BUFFER_CAP_DATA_PTR) {
|
||||
|
|
@ -178,13 +172,13 @@ static const struct wlr_drm_format_set *gles2_get_texture_formats(
|
|||
|
||||
static const struct wlr_drm_format_set *gles2_get_render_formats(
|
||||
struct wlr_renderer *wlr_renderer) {
|
||||
struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer);
|
||||
struct wlr_gles2_renderer *renderer = wlr_gles2_renderer_from_renderer(wlr_renderer);
|
||||
return wlr_egl_get_dmabuf_render_formats(renderer->egl);
|
||||
}
|
||||
|
||||
static int gles2_get_drm_fd(struct wlr_renderer *wlr_renderer) {
|
||||
struct wlr_gles2_renderer *renderer =
|
||||
gles2_get_renderer(wlr_renderer);
|
||||
wlr_gles2_renderer_from_renderer(wlr_renderer);
|
||||
|
||||
if (renderer->drm_fd < 0) {
|
||||
renderer->drm_fd = wlr_egl_dup_drm_fd(renderer->egl);
|
||||
|
|
@ -195,12 +189,12 @@ static int gles2_get_drm_fd(struct wlr_renderer *wlr_renderer) {
|
|||
|
||||
struct wlr_egl *wlr_gles2_renderer_get_egl(struct wlr_renderer *wlr_renderer) {
|
||||
struct wlr_gles2_renderer *renderer =
|
||||
gles2_get_renderer(wlr_renderer);
|
||||
wlr_gles2_renderer_from_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);
|
||||
struct wlr_gles2_renderer *renderer = wlr_gles2_renderer_from_renderer(wlr_renderer);
|
||||
|
||||
wlr_egl_make_current(renderer->egl, NULL);
|
||||
|
||||
|
|
@ -214,13 +208,6 @@ static void gles2_destroy(struct wlr_renderer *wlr_renderer) {
|
|||
destroy_buffer(buffer);
|
||||
}
|
||||
|
||||
push_gles2_debug(renderer);
|
||||
glDeleteProgram(renderer->shaders.quad.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.KHR_debug) {
|
||||
glDisable(GL_DEBUG_OUTPUT_KHR);
|
||||
renderer->procs.glDebugMessageCallbackKHR(NULL, NULL);
|
||||
|
|
@ -240,7 +227,7 @@ static void gles2_destroy(struct wlr_renderer *wlr_renderer) {
|
|||
|
||||
static struct wlr_render_pass *gles2_begin_buffer_pass(struct wlr_renderer *wlr_renderer,
|
||||
struct wlr_buffer *wlr_buffer, const struct wlr_buffer_pass_options *options) {
|
||||
struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer);
|
||||
struct wlr_gles2_renderer *renderer = wlr_gles2_renderer_from_renderer(wlr_renderer);
|
||||
|
||||
struct wlr_egl_context prev_ctx = {0};
|
||||
if (!wlr_egl_make_current(renderer->egl, &prev_ctx)) {
|
||||
|
|
@ -268,7 +255,7 @@ static struct wlr_render_pass *gles2_begin_buffer_pass(struct wlr_renderer *wlr_
|
|||
|
||||
GLuint wlr_gles2_renderer_get_buffer_fbo(struct wlr_renderer *wlr_renderer,
|
||||
struct wlr_buffer *wlr_buffer) {
|
||||
struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer);
|
||||
struct wlr_gles2_renderer *renderer = wlr_gles2_renderer_from_renderer(wlr_renderer);
|
||||
GLuint fbo = 0;
|
||||
|
||||
struct wlr_egl_context prev_ctx = {0};
|
||||
|
|
@ -286,7 +273,7 @@ GLuint wlr_gles2_renderer_get_buffer_fbo(struct wlr_renderer *wlr_renderer,
|
|||
}
|
||||
|
||||
static struct wlr_render_timer *gles2_render_timer_create(struct wlr_renderer *wlr_renderer) {
|
||||
struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer);
|
||||
struct wlr_gles2_renderer *renderer = wlr_gles2_renderer_from_renderer(wlr_renderer);
|
||||
if (!renderer->exts.EXT_disjoint_timer_query) {
|
||||
wlr_log(WLR_ERROR, "can't create timer, EXT_disjoint_timer_query not available");
|
||||
return NULL;
|
||||
|
|
@ -367,7 +354,7 @@ static const struct wlr_render_timer_impl render_timer_impl = {
|
|||
.destroy = gles2_render_timer_destroy,
|
||||
};
|
||||
|
||||
void push_gles2_debug_(struct wlr_gles2_renderer *renderer,
|
||||
void wlr_gles2_push_debug_(struct wlr_gles2_renderer *renderer,
|
||||
const char *file, const char *func) {
|
||||
if (!renderer->procs.glPushDebugGroupKHR) {
|
||||
return;
|
||||
|
|
@ -379,7 +366,7 @@ void push_gles2_debug_(struct wlr_gles2_renderer *renderer,
|
|||
renderer->procs.glPushDebugGroupKHR(GL_DEBUG_SOURCE_APPLICATION_KHR, 1, -1, str);
|
||||
}
|
||||
|
||||
void pop_gles2_debug(struct wlr_gles2_renderer *renderer) {
|
||||
void wlr_gles2_pop_debug(struct wlr_gles2_renderer *renderer) {
|
||||
if (renderer->procs.glPopDebugGroupKHR) {
|
||||
renderer->procs.glPopDebugGroupKHR();
|
||||
}
|
||||
|
|
@ -407,7 +394,7 @@ static void gles2_log(GLenum src, GLenum type, GLuint id, GLenum severity,
|
|||
|
||||
static GLuint compile_shader(struct wlr_gles2_renderer *renderer,
|
||||
GLenum type, const GLchar *src) {
|
||||
push_gles2_debug(renderer);
|
||||
wlr_gles2_push_debug(renderer);
|
||||
|
||||
GLuint shader = glCreateShader(type);
|
||||
glShaderSource(shader, 1, &src, NULL);
|
||||
|
|
@ -421,13 +408,13 @@ static GLuint compile_shader(struct wlr_gles2_renderer *renderer,
|
|||
shader = 0;
|
||||
}
|
||||
|
||||
pop_gles2_debug(renderer);
|
||||
wlr_gles2_pop_debug(renderer);
|
||||
return shader;
|
||||
}
|
||||
|
||||
static GLuint link_program(struct wlr_gles2_renderer *renderer,
|
||||
GLuint wlr_gles2_link_program(struct wlr_gles2_renderer *renderer,
|
||||
const GLchar *vert_src, const GLchar *frag_src) {
|
||||
push_gles2_debug(renderer);
|
||||
wlr_gles2_push_debug(renderer);
|
||||
|
||||
GLuint vert = compile_shader(renderer, GL_VERTEX_SHADER, vert_src);
|
||||
if (!vert) {
|
||||
|
|
@ -458,11 +445,11 @@ static GLuint link_program(struct wlr_gles2_renderer *renderer,
|
|||
goto error;
|
||||
}
|
||||
|
||||
pop_gles2_debug(renderer);
|
||||
wlr_gles2_pop_debug(renderer);
|
||||
return prog;
|
||||
|
||||
error:
|
||||
pop_gles2_debug(renderer);
|
||||
wlr_gles2_pop_debug(renderer);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -630,57 +617,6 @@ struct wlr_renderer *wlr_gles2_renderer_create(struct wlr_egl *egl) {
|
|||
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, common_vert_src, quad_frag_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.tex_rgba.program = prog =
|
||||
link_program(renderer, common_vert_src, tex_rgba_frag_src);
|
||||
if (!renderer->shaders.tex_rgba.program) {
|
||||
goto error;
|
||||
}
|
||||
renderer->shaders.tex_rgba.proj = glGetUniformLocation(prog, "proj");
|
||||
renderer->shaders.tex_rgba.tex_proj = glGetUniformLocation(prog, "tex_proj");
|
||||
renderer->shaders.tex_rgba.tex = glGetUniformLocation(prog, "tex");
|
||||
renderer->shaders.tex_rgba.alpha = glGetUniformLocation(prog, "alpha");
|
||||
renderer->shaders.tex_rgba.pos_attrib = glGetAttribLocation(prog, "pos");
|
||||
|
||||
renderer->shaders.tex_rgbx.program = prog =
|
||||
link_program(renderer, common_vert_src, tex_rgbx_frag_src);
|
||||
if (!renderer->shaders.tex_rgbx.program) {
|
||||
goto error;
|
||||
}
|
||||
renderer->shaders.tex_rgbx.proj = glGetUniformLocation(prog, "proj");
|
||||
renderer->shaders.tex_rgbx.tex_proj = glGetUniformLocation(prog, "tex_proj");
|
||||
renderer->shaders.tex_rgbx.tex = glGetUniformLocation(prog, "tex");
|
||||
renderer->shaders.tex_rgbx.alpha = glGetUniformLocation(prog, "alpha");
|
||||
renderer->shaders.tex_rgbx.pos_attrib = glGetAttribLocation(prog, "pos");
|
||||
|
||||
if (renderer->exts.OES_egl_image_external) {
|
||||
renderer->shaders.tex_ext.program = prog =
|
||||
link_program(renderer, common_vert_src, tex_external_frag_src);
|
||||
if (!renderer->shaders.tex_ext.program) {
|
||||
goto error;
|
||||
}
|
||||
renderer->shaders.tex_ext.proj = glGetUniformLocation(prog, "proj");
|
||||
renderer->shaders.tex_ext.tex_proj = glGetUniformLocation(prog, "tex_proj");
|
||||
renderer->shaders.tex_ext.tex = glGetUniformLocation(prog, "tex");
|
||||
renderer->shaders.tex_ext.alpha = glGetUniformLocation(prog, "alpha");
|
||||
renderer->shaders.tex_ext.pos_attrib = glGetAttribLocation(prog, "pos");
|
||||
}
|
||||
|
||||
pop_gles2_debug(renderer);
|
||||
|
||||
wlr_egl_unset_current(renderer->egl);
|
||||
|
||||
get_gles2_shm_formats(renderer, &renderer->shm_texture_formats);
|
||||
|
||||
int drm_fd = wlr_renderer_get_drm_fd(&renderer->wlr_renderer);
|
||||
|
|
@ -691,28 +627,10 @@ struct wlr_renderer *wlr_gles2_renderer_create(struct wlr_egl *egl) {
|
|||
}
|
||||
|
||||
return &renderer->wlr_renderer;
|
||||
|
||||
error:
|
||||
glDeleteProgram(renderer->shaders.quad.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.KHR_debug) {
|
||||
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);
|
||||
struct wlr_gles2_renderer *renderer = wlr_gles2_renderer_from_renderer(wlr_renderer);
|
||||
return check_gl_ext(renderer->exts_str, ext);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ static bool gles2_texture_update_from_buffer(struct wlr_texture *wlr_texture,
|
|||
struct wlr_egl_context prev_ctx;
|
||||
wlr_egl_make_current(texture->renderer->egl, &prev_ctx);
|
||||
|
||||
push_gles2_debug(texture->renderer);
|
||||
wlr_gles2_push_debug(texture->renderer);
|
||||
|
||||
glBindTexture(GL_TEXTURE_2D, texture->tex);
|
||||
|
||||
|
|
@ -97,7 +97,7 @@ static bool gles2_texture_update_from_buffer(struct wlr_texture *wlr_texture,
|
|||
|
||||
glBindTexture(GL_TEXTURE_2D, 0);
|
||||
|
||||
pop_gles2_debug(texture->renderer);
|
||||
wlr_gles2_pop_debug(texture->renderer);
|
||||
|
||||
wlr_egl_restore_context(&prev_ctx);
|
||||
|
||||
|
|
@ -114,12 +114,12 @@ void gles2_texture_destroy(struct wlr_gles2_texture *texture) {
|
|||
struct wlr_egl_context prev_ctx;
|
||||
wlr_egl_make_current(texture->renderer->egl, &prev_ctx);
|
||||
|
||||
push_gles2_debug(texture->renderer);
|
||||
wlr_gles2_push_debug(texture->renderer);
|
||||
|
||||
glDeleteTextures(1, &texture->tex);
|
||||
glDeleteFramebuffers(1, &texture->fbo);
|
||||
|
||||
pop_gles2_debug(texture->renderer);
|
||||
wlr_gles2_pop_debug(texture->renderer);
|
||||
|
||||
wlr_egl_restore_context(&prev_ctx);
|
||||
}
|
||||
|
|
@ -193,7 +193,7 @@ static bool gles2_texture_read_pixels(struct wlr_texture *wlr_texture,
|
|||
return false;
|
||||
}
|
||||
|
||||
push_gles2_debug(texture->renderer);
|
||||
wlr_gles2_push_debug(texture->renderer);
|
||||
struct wlr_egl_context prev_ctx;
|
||||
if (!wlr_egl_make_current(texture->renderer->egl, &prev_ctx)) {
|
||||
return false;
|
||||
|
|
@ -249,7 +249,7 @@ static bool gles2_texture_read_pixels(struct wlr_texture *wlr_texture,
|
|||
}
|
||||
|
||||
wlr_egl_restore_context(&prev_ctx);
|
||||
pop_gles2_debug(texture->renderer);
|
||||
wlr_gles2_pop_debug(texture->renderer);
|
||||
|
||||
return glGetError() == GL_NO_ERROR;
|
||||
}
|
||||
|
|
@ -257,7 +257,7 @@ static bool gles2_texture_read_pixels(struct wlr_texture *wlr_texture,
|
|||
static uint32_t gles2_texture_preferred_read_format(struct wlr_texture *wlr_texture) {
|
||||
struct wlr_gles2_texture *texture = gles2_get_texture(wlr_texture);
|
||||
|
||||
push_gles2_debug(texture->renderer);
|
||||
wlr_gles2_push_debug(texture->renderer);
|
||||
|
||||
uint32_t fmt = DRM_FORMAT_INVALID;
|
||||
|
||||
|
|
@ -276,7 +276,7 @@ static uint32_t gles2_texture_preferred_read_format(struct wlr_texture *wlr_text
|
|||
glGetIntegerv(GL_ALPHA_BITS, &alpha_size);
|
||||
|
||||
glBindFramebuffer(GL_FRAMEBUFFER, 0);
|
||||
pop_gles2_debug(texture->renderer);
|
||||
wlr_gles2_pop_debug(texture->renderer);
|
||||
|
||||
const struct wlr_gles2_pixel_format *pix_fmt =
|
||||
get_gles2_format_from_gl(gl_format, gl_type, alpha_size > 0);
|
||||
|
|
@ -320,7 +320,7 @@ static struct wlr_texture *gles2_texture_from_pixels(
|
|||
struct wlr_renderer *wlr_renderer,
|
||||
uint32_t drm_format, uint32_t stride, uint32_t width,
|
||||
uint32_t height, const void *data) {
|
||||
struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer);
|
||||
struct wlr_gles2_renderer *renderer = wlr_gles2_renderer_from_renderer(wlr_renderer);
|
||||
|
||||
const struct wlr_gles2_pixel_format *fmt =
|
||||
get_gles2_format_from_drm(drm_format);
|
||||
|
|
@ -358,7 +358,7 @@ static struct wlr_texture *gles2_texture_from_pixels(
|
|||
struct wlr_egl_context prev_ctx;
|
||||
wlr_egl_make_current(renderer->egl, &prev_ctx);
|
||||
|
||||
push_gles2_debug(renderer);
|
||||
wlr_gles2_push_debug(renderer);
|
||||
|
||||
glGenTextures(1, &texture->tex);
|
||||
glBindTexture(GL_TEXTURE_2D, texture->tex);
|
||||
|
|
@ -372,7 +372,7 @@ static struct wlr_texture *gles2_texture_from_pixels(
|
|||
|
||||
glBindTexture(GL_TEXTURE_2D, 0);
|
||||
|
||||
pop_gles2_debug(renderer);
|
||||
wlr_gles2_pop_debug(renderer);
|
||||
|
||||
wlr_egl_restore_context(&prev_ctx);
|
||||
|
||||
|
|
@ -404,7 +404,7 @@ static struct wlr_texture *gles2_texture_from_dmabuf(
|
|||
|
||||
struct wlr_egl_context prev_ctx;
|
||||
wlr_egl_make_current(renderer->egl, &prev_ctx);
|
||||
push_gles2_debug(texture->renderer);
|
||||
wlr_gles2_push_debug(texture->renderer);
|
||||
|
||||
bool invalid;
|
||||
if (!buffer->tex) {
|
||||
|
|
@ -423,7 +423,7 @@ static struct wlr_texture *gles2_texture_from_dmabuf(
|
|||
glBindTexture(texture->target, 0);
|
||||
}
|
||||
|
||||
pop_gles2_debug(texture->renderer);
|
||||
wlr_gles2_pop_debug(texture->renderer);
|
||||
wlr_egl_restore_context(&prev_ctx);
|
||||
|
||||
texture->tex = buffer->tex;
|
||||
|
|
@ -433,7 +433,7 @@ static struct wlr_texture *gles2_texture_from_dmabuf(
|
|||
|
||||
struct wlr_texture *gles2_texture_from_buffer(struct wlr_renderer *wlr_renderer,
|
||||
struct wlr_buffer *buffer) {
|
||||
struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer);
|
||||
struct wlr_gles2_renderer *renderer = wlr_gles2_renderer_from_renderer(wlr_renderer);
|
||||
|
||||
void *data;
|
||||
uint32_t format;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue