AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-13 12:20:10 +00:00
Code Issues Projects Releases Wiki Activity

gldriver: Don't create surfaces to upload textures

Browse Source
This commit is contained in:
Timm Bäder 2018-11-24 11:15:29 +01:00
parent b7963a06ab
commit 6466e53bfc
1 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gsk/gl/gskgldriver.c
View File

@ -6,6 +6,7 @@
#include "gskprofilerprivate.h" #include "gskprofilerprivate.h"
#include "gdk/gdktextureprivate.h" #include "gdk/gdktextureprivate.h"
#include "gdk/gdkgltextureprivate.h" #include "gdk/gdkgltextureprivate.h"
#include "gdk/gdkglcontextprivate.h"
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include <epoxy/gl.h> #include <epoxy/gl.h>
@ -111,6 +112,34 @@ gsk_gl_driver_set_texture_parameters (GskGLDriver *self,
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
} }
static void
gsk_gl_driver_upload_texture (GskGLDriver *self,
Texture *texture,
int min_filter,
int mag_filter,
guchar *data)
{
if (self->bound_source_texture != texture)
{
g_critical ("You must bind the texture before initializing it.");
return;
}
gsk_gl_driver_set_texture_parameters (self, min_filter, mag_filter);
gdk_gl_context_upload_texture (self->gl_context,
data,
texture->width,
texture->height,
texture->width * 4,
GL_TEXTURE_2D);
texture->min_filter = min_filter;
texture->mag_filter = mag_filter;
if (texture->min_filter != GL_NEAREST)
glGenerateMipmap (GL_TEXTURE_2D);
}
static void static void
gsk_gl_driver_finalize (GObject *gobject) gsk_gl_driver_finalize (GObject *gobject)
{ {
@ -497,8 +526,9 @@ gsk_gl_driver_get_texture_for_texture (GskGLDriver *self,
int min_filter, int min_filter,
int mag_filter) int mag_filter)
{ {
const int stride = gdk_texture_get_width (texture) * 4;
Texture *t; Texture *t;
cairo_surface_t *surface; guchar *texture_data = NULL;
if (GDK_IS_GL_TEXTURE (texture)) if (GDK_IS_GL_TEXTURE (texture))
{ {
@ -509,7 +539,8 @@ gsk_gl_driver_get_texture_for_texture (GskGLDriver *self,
/* In this case, we have to temporarily make the texture's context the current one, /* In this case, we have to temporarily make the texture's context the current one,
* download its data into our context and then create a texture from it. */ * download its data into our context and then create a texture from it. */
gdk_gl_context_make_current (texture_context); gdk_gl_context_make_current (texture_context);
surface = gdk_texture_download_surface (texture); texture_data = g_malloc (stride * gdk_texture_get_height (texture));
gdk_texture_download (texture, texture_data, stride);
gdk_gl_context_make_current (self->gl_context); gdk_gl_context_make_current (self->gl_context);
} }
else else
@ -528,8 +559,10 @@ gsk_gl_driver_get_texture_for_texture (GskGLDriver *self,
return t->texture_id; return t->texture_id;
} }
surface = gdk_texture_download_surface (texture); texture_data = g_malloc (stride * gdk_texture_get_height (texture));
gdk_texture_download (texture, texture_data, stride);
} }
g_assert (texture_data != NULL);
t = create_texture (self, gdk_texture_get_width (texture), gdk_texture_get_height (texture)); t = create_texture (self, gdk_texture_get_width (texture), gdk_texture_get_height (texture));
@ -537,12 +570,9 @@ gsk_gl_driver_get_texture_for_texture (GskGLDriver *self,
t->user = texture; t->user = texture;
gsk_gl_driver_bind_source_texture (self, t->texture_id); gsk_gl_driver_bind_source_texture (self, t->texture_id);
gsk_gl_driver_init_texture_with_surface (self, gsk_gl_driver_upload_texture (self, t, min_filter, mag_filter, texture_data);
t->texture_id,
surface, g_free (texture_data);
min_filter,
mag_filter);
cairo_surface_destroy (surface);
return t->texture_id; return t->texture_id;
} }