blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1047 from NotKit/gles2fix 

Fix GLES2 renderer to use glGetUniformLocations locations
This commit is contained in:
emersion 2018-06-13 15:37:16 +01:00 committed by GitHub
parent 5e4af4862e 6f29db1044
commit d643361c48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 84 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/render/gles2.h
View File

@ -25,6 +25,14 @@ struct wlr_gles2_pixel_format {
bool has_alpha; bool has_alpha;
}; };
struct wlr_gles2_tex_shader {
GLuint program;
GLint proj;
GLint invert_y;
GLint tex;
GLint alpha;
};
struct wlr_gles2_renderer { struct wlr_gles2_renderer {
struct wlr_renderer wlr_renderer; struct wlr_renderer wlr_renderer;
@ -32,11 +40,19 @@ struct wlr_gles2_renderer {
const char *exts_str; const char *exts_str;
struct { struct {
GLuint quad; struct {
GLuint ellipse; GLuint program;
GLuint tex_rgba; GLint proj;
GLuint tex_rgbx; GLint color;
GLuint tex_ext; } quad;
struct {
GLuint program;
GLint proj;
GLint color;
} ellipse;
struct wlr_gles2_tex_shader tex_rgba;
struct wlr_gles2_tex_shader tex_rgbx;
struct wlr_gles2_tex_shader tex_ext;
} shaders; } shaders;
uint32_t viewport_width, viewport_height; uint32_t viewport_width, viewport_height;

97
render/gles2/renderer.c
View File

@ -118,18 +118,22 @@ static bool gles2_render_texture_with_matrix(struct wlr_renderer *wlr_renderer,
struct wlr_gles2_texture *texture = struct wlr_gles2_texture *texture =
get_gles2_texture_in_context(wlr_texture); get_gles2_texture_in_context(wlr_texture);
GLuint prog = 0; struct wlr_gles2_tex_shader *shader = NULL;
GLenum target = 0; GLenum target = 0;
switch (texture->type) { switch (texture->type) {
case WLR_GLES2_TEXTURE_GLTEX: case WLR_GLES2_TEXTURE_GLTEX:
case WLR_GLES2_TEXTURE_WL_DRM_GL: case WLR_GLES2_TEXTURE_WL_DRM_GL:
prog = texture->has_alpha ? renderer->shaders.tex_rgba : if (texture->has_alpha) {
renderer->shaders.tex_rgbx; shader = &renderer->shaders.tex_rgba;
} else {
shader = &renderer->shaders.tex_rgbx;
}
target = GL_TEXTURE_2D; target = GL_TEXTURE_2D;
break; break;
case WLR_GLES2_TEXTURE_WL_DRM_EXT: case WLR_GLES2_TEXTURE_WL_DRM_EXT:
case WLR_GLES2_TEXTURE_DMABUF: case WLR_GLES2_TEXTURE_DMABUF:
prog = renderer->shaders.tex_ext; shader = &renderer->shaders.tex_ext;
target = GL_TEXTURE_EXTERNAL_OES; target = GL_TEXTURE_EXTERNAL_OES;
break; 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_MIN_FILTER, GL_LINEAR);
glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glUseProgram(prog); glUseProgram(shader->program);
glUniformMatrix3fv(0, 1, GL_FALSE, transposition); glUniformMatrix3fv(shader->proj, 1, GL_FALSE, transposition);
glUniform1i(1, texture->inverted_y); glUniform1i(shader->invert_y, texture->inverted_y);
glUniform1f(3, alpha); glUniform1i(shader->tex, 0);
glUniform1f(shader->alpha, alpha);
draw_quad(); draw_quad();
@ -173,9 +178,10 @@ static void gles2_render_quad_with_matrix(struct wlr_renderer *wlr_renderer,
wlr_matrix_transpose(transposition, matrix); wlr_matrix_transpose(transposition, matrix);
PUSH_GLES2_DEBUG; PUSH_GLES2_DEBUG;
glUseProgram(renderer->shaders.quad); glUseProgram(renderer->shaders.quad.program);
glUniformMatrix3fv(0, 1, GL_FALSE, transposition);
glUniform4f(1, color[0], color[1], color[2], color[3]); glUniformMatrix3fv(renderer->shaders.quad.proj, 1, GL_FALSE, transposition);
glUniform4f(renderer->shaders.quad.color, color[0], color[1], color[2], color[3]);
draw_quad(); draw_quad();
POP_GLES2_DEBUG; POP_GLES2_DEBUG;
} }
@ -191,9 +197,10 @@ static void gles2_render_ellipse_with_matrix(struct wlr_renderer *wlr_renderer,
wlr_matrix_transpose(transposition, matrix); wlr_matrix_transpose(transposition, matrix);
PUSH_GLES2_DEBUG; PUSH_GLES2_DEBUG;
glUseProgram(renderer->shaders.ellipse); glUseProgram(renderer->shaders.ellipse.program);
glUniformMatrix3fv(0, 1, GL_FALSE, transposition);
glUniform4f(1, color[0], color[1], color[2], color[3]); glUniformMatrix3fv(renderer->shaders.ellipse.proj, 1, GL_FALSE, transposition);
glUniform4f(renderer->shaders.ellipse.color, color[0], color[1], color[2], color[3]);
draw_quad(); draw_quad();
POP_GLES2_DEBUG; POP_GLES2_DEBUG;
} }
@ -313,11 +320,11 @@ static void gles2_destroy(struct wlr_renderer *wlr_renderer) {
wlr_egl_make_current(renderer->egl, EGL_NO_SURFACE, NULL); wlr_egl_make_current(renderer->egl, EGL_NO_SURFACE, NULL);
PUSH_GLES2_DEBUG; PUSH_GLES2_DEBUG;
glDeleteProgram(renderer->shaders.quad); glDeleteProgram(renderer->shaders.quad.program);
glDeleteProgram(renderer->shaders.ellipse); glDeleteProgram(renderer->shaders.ellipse.program);
glDeleteProgram(renderer->shaders.tex_rgba); glDeleteProgram(renderer->shaders.tex_rgba.program);
glDeleteProgram(renderer->shaders.tex_rgbx); glDeleteProgram(renderer->shaders.tex_rgbx.program);
glDeleteProgram(renderer->shaders.tex_ext); glDeleteProgram(renderer->shaders.tex_ext.program);
POP_GLES2_DEBUG; POP_GLES2_DEBUG;
if (glDebugMessageCallbackKHR) { if (glDebugMessageCallbackKHR) {
@ -486,31 +493,53 @@ struct wlr_renderer *wlr_gles2_renderer_create(struct wlr_egl *egl) {
PUSH_GLES2_DEBUG; PUSH_GLES2_DEBUG;
renderer->shaders.quad = link_program(quad_vertex_src, quad_fragment_src); GLuint prog;
if (!renderer->shaders.quad) { renderer->shaders.quad.program = prog =
link_program(quad_vertex_src, quad_fragment_src);
if (!renderer->shaders.quad.program) {
goto error; 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); link_program(quad_vertex_src, ellipse_fragment_src);
if (!renderer->shaders.ellipse) { if (!renderer->shaders.ellipse.program) {
goto error; 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); link_program(tex_vertex_src, tex_fragment_src_rgba);
if (!renderer->shaders.tex_rgba) { if (!renderer->shaders.tex_rgba.program) {
goto error; 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); link_program(tex_vertex_src, tex_fragment_src_rgbx);
if (!renderer->shaders.tex_rgbx) { if (!renderer->shaders.tex_rgbx.program) {
goto error; 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) { if (glEGLImageTargetTexture2DOES) {
renderer->shaders.tex_ext = renderer->shaders.tex_ext.program = prog =
link_program(tex_vertex_src, tex_fragment_src_external); link_program(tex_vertex_src, tex_fragment_src_external);
if (!renderer->shaders.tex_ext) { if (!renderer->shaders.tex_ext.program) {
goto error; 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; POP_GLES2_DEBUG;
@ -518,11 +547,11 @@ struct wlr_renderer *wlr_gles2_renderer_create(struct wlr_egl *egl) {
return &renderer->wlr_renderer; return &renderer->wlr_renderer;
error: error:
glDeleteProgram(renderer->shaders.quad); glDeleteProgram(renderer->shaders.quad.program);
glDeleteProgram(renderer->shaders.ellipse); glDeleteProgram(renderer->shaders.ellipse.program);
glDeleteProgram(renderer->shaders.tex_rgba); glDeleteProgram(renderer->shaders.tex_rgba.program);
glDeleteProgram(renderer->shaders.tex_rgbx); glDeleteProgram(renderer->shaders.tex_rgbx.program);
glDeleteProgram(renderer->shaders.tex_ext); glDeleteProgram(renderer->shaders.tex_ext.program);
POP_GLES2_DEBUG; POP_GLES2_DEBUG;