summaryrefslogtreecommitdiff
path: root/gdk/gdkgl.c
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2015-02-09 19:09:31 +0000
committerEmmanuele Bassi <ebassi@gnome.org>2015-02-09 19:10:31 +0000
commit843475bd2ef7130051c781f48fcb64f32b6872c2 (patch)
tree434f0f087b1f58ec203a9c5c933f651309559510 /gdk/gdkgl.c
parent3b4bf963f60cbf40c9c69f8c50f1358a7ccc46b5 (diff)
downloadgtk+-843475bd2ef7130051c781f48fcb64f32b6872c2.tar.gz
gl: Drop GdkGLContextClass.upload_texture()
It's unnecessary to allow per-backend overrides.
Diffstat (limited to 'gdk/gdkgl.c')
-rw-r--r--gdk/gdkgl.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c
index be3d6f428e..4eff0a6ae3 100644
--- a/gdk/gdkgl.c
+++ b/gdk/gdkgl.c
@@ -716,8 +716,7 @@ gdk_gl_texture_from_surface (cairo_surface_t *surface,
e.height *= sy;
image = cairo_surface_map_to_image (surface, &e);
- /* We might have a different alignment, stride or format, so allow overriding here if needed */
- GDK_GL_CONTEXT_GET_CLASS (paint_context)->upload_texture (paint_context, image, e.width, e.height, target);
+ gdk_gl_context_upload_texture (paint_context, image, e.width, e.height, target);
cairo_surface_unmap_image (surface, image);
@@ -746,6 +745,8 @@ gdk_gl_texture_from_surface (cairo_surface_t *surface,
}
}
+#undef FLIP_Y
+
glDisable (GL_SCISSOR_TEST);
glDeleteTextures (1, &texture_id);
}