diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-09-26 00:30:31 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-09-26 00:30:31 +0000 |
| commit | 1b93108d10fe4d129714ba8f5643b0a0f0912cff (patch) | |
| tree | 34d103ad1a61a473e88504b23ebbb6ae00aebb15 | |
| parent | a9de1d702ef389c47f7bc78baefcb761a4b73a04 (diff) | |
| parent | 3db217ab7aa683fed8fb2ab3603e021c7136a35a (diff) | |
| download | gtk+-1b93108d10fe4d129714ba8f5643b0a0f0912cff.tar.gz | |
Merge branch 'fix-rgb-upload' into 'master'
gl: Fix RGB uploads
Closes #3194
See merge request GNOME/gtk!2620
| -rw-r--r-- | gdk/gdkglcontext.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c index f9512b0343..7f544dc003 100644 --- a/gdk/gdkglcontext.c +++ b/gdk/gdkglcontext.c @@ -291,7 +291,10 @@ gdk_gl_context_upload_texture (GdkGLContext *context, */ if (stride == width * bpp) { + glPixelStorei (GL_UNPACK_ALIGNMENT, 1); + glTexImage2D (texture_target, 0, GL_RGBA, width, height, 0, gl_format, gl_type, data); + glPixelStorei (GL_UNPACK_ALIGNMENT, 4); } else if ((!priv->use_es || (priv->use_es && (priv->gl_version >= 30 || priv->has_unpack_subimage)))) @@ -302,6 +305,7 @@ gdk_gl_context_upload_texture (GdkGLContext *context, glTexImage2D (texture_target, 0, GL_RGBA, width, height, 0, gl_format, gl_type, data); glPixelStorei (GL_UNPACK_ROW_LENGTH, 0); + glPixelStorei (GL_UNPACK_ALIGNMENT, 4); } else { |