diff options
| author | Niels Nesse <nnesse@sonic.net> | 2015-01-14 17:30:28 -0800 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2015-01-28 12:00:30 +0000 |
| commit | 27cf0fa34c3a51ddb50391f21aaf2e3984d6dddb (patch) | |
| tree | 6eb96e9b72cfd5e659971c63c931eec217b92ba8 /gdk/gdkglcontext.c | |
| parent | 9e85fcbe7cc3cf296b125f149d20645c821d4b62 (diff) | |
| download | gtk+-27cf0fa34c3a51ddb50391f21aaf2e3984d6dddb.tar.gz | |
Fix core context creation in GdkGLContext
- Specifically request GL version when creating context. Just specifying core
profile bit results in the requested version defaulting to 1.0 which causes
the core profile bit to be ignored and an arbitrary compatability context to be
returned.
- Fix GL painting by removing GL calls that have been depricated by the 3.2 core
profile.
- Additionally remove glInvalidateFramebuffer() call, it is not supported by 3.2
core.
https://bugzilla.gnome.org/show_bug.cgi?id=742953
Diffstat (limited to 'gdk/gdkglcontext.c')
| -rw-r--r-- | gdk/gdkglcontext.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c index 93d5d2c6a6..829e302c82 100644 --- a/gdk/gdkglcontext.c +++ b/gdk/gdkglcontext.c @@ -238,7 +238,7 @@ gdk_gl_context_upload_texture (GdkGLContext *context, glPixelStorei (GL_UNPACK_ALIGNMENT, 4); glPixelStorei (GL_UNPACK_ROW_LENGTH, cairo_image_surface_get_stride (image_surface)/4); - glTexImage2D (texture_target, 0, 4, width, height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, + glTexImage2D (texture_target, 0, GL_RGBA, width, height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, cairo_image_surface_get_data (image_surface)); glPixelStorei (GL_UNPACK_ROW_LENGTH, 0); } |