mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-07 13:29:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add error "handling" to gles3 backend

Browse source
This commit is contained in:
Drew DeVault 2017-06-09 10:28:50 -04:00
parent 63c3faa006
commit 2b909e1729
5 changed files with 87 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

17
render/gles3/surface.c
View file

@ -15,11 +15,10 @@ static bool gles3_surface_attach_pixels(struct wlr_surface_state *surface,
surface->wlr_surface->width = width;
surface->wlr_surface->height = height;
surface->wlr_surface->format = format;
// TODO: Error handling
glGenTextures(1, &surface->tex_id);
glBindTexture(GL_TEXTURE_2D, surface->tex_id);
glTexImage2D(GL_TEXTURE_2D, 0, format, width, height, 0,
format, GL_UNSIGNED_BYTE, pixels);
GL_CALL(glGenTextures(1, &surface->tex_id));
GL_CALL(glBindTexture(GL_TEXTURE_2D, surface->tex_id));
GL_CALL(glTexImage2D(GL_TEXTURE_2D, 0, format, width, height, 0,
format, GL_UNSIGNED_BYTE, pixels));
surface->wlr_surface->valid = true;
return true;
}
@ -37,10 +36,10 @@ static void gles3_surface_get_matrix(struct wlr_surface_state *surface,
}
static void gles3_surface_bind(struct wlr_surface_state *surface) {
glActiveTexture(GL_TEXTURE0 + 1);
glBindTexture(GL_TEXTURE_2D, surface->tex_id);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
GL_CALL(glActiveTexture(GL_TEXTURE0 + 1));
GL_CALL(glBindTexture(GL_TEXTURE_2D, surface->tex_id));
GL_CALL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR));
GL_CALL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR));
}
static void gles3_surface_destroy(struct wlr_surface_state *surface) {