Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-09-20 09:21:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] egl: upload damage vertices with glBufferSubData

Browse Source 
This avoids the issues surrounding glMapBuffer and glMapBufferRange in
OpenGL ES.
This commit is contained in:
Quantum 2021-07-18 00:06:32 -04:00 committed by Geoffrey McRae
parent f49f2af6cd
commit 6472c28473
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
client/renderers/EGL/damage.c
View File

@ -37,10 +37,9 @@ struct EGL_Damage
{ {
EGL_Shader * shader; EGL_Shader * shader;
GLfloat transform[6]; GLfloat transform[6];
GLuint buffers[2]; GLuint buffers[2];
GLuint vao; GLuint vao;
GLfloat * vertices;
bool show; bool show;
KeybindHandle toggleHandle; KeybindHandle toggleHandle;
@ -92,7 +91,6 @@ bool egl_damage_init(EGL_Damage ** damage)
glBufferData(GL_ARRAY_BUFFER, KVMFR_MAX_DAMAGE_RECTS * 8 * sizeof(GLfloat), NULL, GL_STREAM_DRAW); glBufferData(GL_ARRAY_BUFFER, KVMFR_MAX_DAMAGE_RECTS * 8 * sizeof(GLfloat), NULL, GL_STREAM_DRAW);
glEnableVertexAttribArray(0); glEnableVertexAttribArray(0);
glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, NULL); glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, NULL);
(*damage)->vertices = glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY);
glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ARRAY_BUFFER, 0);
GLushort indices[KVMFR_MAX_DAMAGE_RECTS * 6]; GLushort indices[KVMFR_MAX_DAMAGE_RECTS * 6];
@ -124,11 +122,7 @@ void egl_damage_free(EGL_Damage ** damage)
app_releaseKeybind(&(*damage)->toggleHandle); app_releaseKeybind(&(*damage)->toggleHandle);
glDeleteVertexArrays(1, &(*damage)->vao); glDeleteVertexArrays(1, &(*damage)->vao);
glBindBuffer(GL_ARRAY_BUFFER, (*damage)->buffers[0]);
glUnmapBuffer(GL_ARRAY_BUFFER);
glDeleteBuffers(2, (*damage)->buffers); glDeleteBuffers(2, (*damage)->buffers);
egl_shader_free(&(*damage)->shader); egl_shader_free(&(*damage)->shader);
free(*damage); free(*damage);
@ -187,20 +181,25 @@ bool egl_damage_render(EGL_Damage * damage, const struct DesktopDamage * data)
egl_shader_use(damage->shader); egl_shader_use(damage->shader);
glUniformMatrix3x2fv(damage->uTransform, 1, GL_FALSE, damage->transform); glUniformMatrix3x2fv(damage->uTransform, 1, GL_FALSE, damage->transform);
GLfloat vertices[KVMFR_MAX_DAMAGE_RECTS * 8];
if (count == 0) if (count == 0)
{ {
FrameDamageRect rect = { FrameDamageRect full = {
.x = 0, .y = 0, .width = damage->width, .height = damage->height, .x = 0, .y = 0, .width = damage->width, .height = damage->height,
}; };
rectToVertices(damage->vertices, &rect);
count = 1; count = 1;
rectToVertices(vertices, &full);
} }
else else
{ {
for (int i = 0; i < count; ++i) for (int i = 0; i < count; ++i)
rectToVertices(damage->vertices + i * 8, data->rects + i); rectToVertices(vertices + i * 8, data->rects + i);
} }
glBindBuffer(GL_ARRAY_BUFFER, damage->buffers[0]);
glBufferSubData(GL_ARRAY_BUFFER, 0, count * 8 * sizeof(GLfloat), vertices);
glBindBuffer(GL_ARRAY_BUFFER, 0);
glBindVertexArray(damage->vao); glBindVertexArray(damage->vao);
glDrawElements(GL_TRIANGLES, 6 * count, GL_UNSIGNED_SHORT, NULL); glDrawElements(GL_TRIANGLES, 6 * count, GL_UNSIGNED_SHORT, NULL);
glBindVertexArray(0); glBindVertexArray(0);