frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ephyr: Fix redisplay with glamor on GLES. 

glamor_transfer.c is still totally broken, though.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Eric Anholt 2016-02-01 13:58:15 -08:00 committed by Adam Jackson
parent 0b4c0c75d0
commit c01094c531
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/kdrive/ephyr/ephyr_glamor_glx.c
View File

@ -225,8 +225,10 @@ ephyr_glamor_damage_redisplay(struct ephyr_glamor *glamor,
if (glamor->vao) { if (glamor->vao) {
glGetIntegerv(GL_VERTEX_ARRAY_BINDING, &old_vao); glGetIntegerv(GL_VERTEX_ARRAY_BINDING, &old_vao);
glBindVertexArray(glamor->vao); glBindVertexArray(glamor->vao);
} else } else {
glBindBuffer(GL_ARRAY_BUFFER, glamor->vbo);
ephyr_glamor_set_vertices(glamor); ephyr_glamor_set_vertices(glamor);
}
glBindFramebuffer(GL_FRAMEBUFFER, 0); glBindFramebuffer(GL_FRAMEBUFFER, 0);
glUseProgram(glamor->texture_shader); glUseProgram(glamor->texture_shader);