hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-22 21:05:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use texture->pixel_format instead of re-scanning

Browse source
This commit is contained in:
Drew DeVault 2017-08-09 22:56:57 -04:00
parent 4de930542f
commit e2b7712302
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
render/gles2/texture.c
View file

@ -43,11 +43,7 @@ static bool gles2_texture_update_pixels(struct wlr_texture_state *texture,
return gles2_texture_upload_pixels(texture, format, stride, return gles2_texture_upload_pixels(texture, format, stride,
width, height, pixels); width, height, pixels);
} }
const struct pixel_format *fmt = gl_format_for_wl_format(format); const struct pixel_format *fmt = texture->pixel_format;
if (!fmt || !fmt->gl_format) {
wlr_log(L_ERROR, "No supported pixel format for this texture");
return false;
}
GL_CALL(glBindTexture(GL_TEXTURE_2D, texture->tex_id)); GL_CALL(glBindTexture(GL_TEXTURE_2D, texture->tex_id));
GL_CALL(glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, stride)); GL_CALL(glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, stride));
GL_CALL(glPixelStorei(GL_UNPACK_SKIP_PIXELS_EXT, x)); GL_CALL(glPixelStorei(GL_UNPACK_SKIP_PIXELS_EXT, x));
@ -98,11 +94,7 @@ static bool gles2_texture_update_shm(struct wlr_texture_state *texture,
if (texture->wlr_texture->format != format) { if (texture->wlr_texture->format != format) {
return gles2_texture_upload_shm(texture, format, buffer); return gles2_texture_upload_shm(texture, format, buffer);
} }
const struct pixel_format *fmt = gl_format_for_wl_format(format); const struct pixel_format *fmt = texture->pixel_format;
if (!fmt || !fmt->gl_format) {
wlr_log(L_ERROR, "No supported pixel format for this texture");
return false;
}
wl_shm_buffer_begin_access(buffer); wl_shm_buffer_begin_access(buffer);
uint8_t *pixels = wl_shm_buffer_get_data(buffer); uint8_t *pixels = wl_shm_buffer_get_data(buffer);
int pitch = wl_shm_buffer_get_stride(buffer) / (fmt->bpp / 8); int pitch = wl_shm_buffer_get_stride(buffer) / (fmt->bpp / 8);