Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gsk: Use surface-to-texture utility function

Browse Source 
Now that we have it.
This commit is contained in:
Emmanuele Bassi
2016-04-25 11:41:15 +01:00
parent 55d2522fb0
commit 0eaf85704b
1 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gsk/gskglrenderer.c
View File

@@ -584,22 +584,13 @@ surface_to_texture (cairo_surface_t *surface,
int mag_filter,
guint *texture_out)
{
cairo_surface_t *tmp;
guint texture_id;
cairo_surface_flush (surface);
tmp = cairo_surface_map_to_image (surface, &(cairo_rectangle_int_t) {
0, 0,
clip->size.width,
clip->size.height
});
glGenTextures (1, &texture_id);
glBindTexture (GL_TEXTURE_2D, texture_id);
GSK_NOTE (OPENGL, g_print ("Uploading px@[%p] { w:%g, h:%g } to texid:%d\n",
cairo_image_surface_get_data (tmp),
GSK_NOTE (OPENGL, g_print ("Uploading surface[%p] { w:%g, h:%g } to texid:%d\n",
surface,
clip->size.width,
clip->size.height,
texture_id));
@@ -609,22 +600,13 @@ surface_to_texture (cairo_surface_t *surface,
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter);
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter);
glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
glPixelStorei (GL_UNPACK_ROW_LENGTH, cairo_image_surface_get_stride (tmp) / 4);
glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA,
clip->size.width,
clip->size.height,
0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV,
cairo_image_surface_get_data (tmp));
glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
gdk_cairo_surface_upload_to_gl (surface, GL_TEXTURE_2D, clip->size.width, clip->size.height, NULL);
if (min_filter != GL_NEAREST)
glGenerateMipmap (GL_TEXTURE_2D);
GSK_NOTE (OPENGL, g_print ("New texture id %d from surface %p\n", texture_id, surface));
cairo_surface_unmap_image (surface, tmp);
*texture_out = texture_id;
}