GDK-Win32: Drop Win32-specific ->upload_texture()

The default ->upload_texture() works also for Windows since commit 27cf0fa,
as some of the problems described in 742953 also applied for GL core
contexts on Windows as well before 27cf0fa.  Clean up the GDK-Win32 code a
little bit as a result.
This commit is contained in:
Chun-wei Fan 2015-02-06 12:41:38 +08:00
parent 93c3b90f6a
commit 24e6bda264

View File

@ -73,7 +73,6 @@ gdk_win32_gl_context_class_init (GdkWin32GLContextClass *klass)
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
context_class->end_frame = _gdk_win32_gl_context_end_frame;
context_class->upload_texture = _gdk_win32_gl_context_upload_texture;
gobject_class->dispose = _gdk_win32_gl_context_dispose;
}
@ -189,22 +188,6 @@ _gdk_win32_window_invalidate_for_new_frame (GdkWindow *window,
}
}
void
_gdk_win32_gl_context_upload_texture (GdkGLContext *context,
cairo_surface_t *image_surface,
int width,
int height,
guint texture_target)
{
g_return_if_fail (GDK_WIN32_IS_GL_CONTEXT (context));
glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
glPixelStorei (GL_UNPACK_ROW_LENGTH, cairo_image_surface_get_stride (image_surface)/4);
glTexImage2D (texture_target, 0, GL_RGBA, width, height, 0, GL_BGRA, GL_UNSIGNED_BYTE,
cairo_image_surface_get_data (image_surface));
glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
}
typedef struct
{
ATOM wc_atom;