diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-09-26 12:52:25 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-09-26 12:52:25 +0000 |
| commit | 54944c9cea983669c571861e0ca15f25d0e4b8c3 (patch) | |
| tree | c31eab6050a93762fb2953fdef56231a394ffc94 /gdk | |
| parent | fe8986f2d51605a6ff11d015b0adbea45a8fbf23 (diff) | |
| parent | d6912a6791f178da16f2877d5885e9aaf3cf29b6 (diff) | |
| download | gtk+-54944c9cea983669c571861e0ca15f25d0e4b8c3.tar.gz | |
Merge branch 'fix-texture-upload-more' into 'master'
More texture upload fixes
Closes #3198
See merge request GNOME/gtk!2624
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/gdkglcontext.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c index 7a7ed9d96f..71a854816b 100644 --- a/gdk/gdkglcontext.c +++ b/gdk/gdkglcontext.c @@ -299,13 +299,11 @@ gdk_gl_context_upload_texture (GdkGLContext *context, else if ((!priv->use_es || (priv->use_es && (priv->gl_version >= 30 || priv->has_unpack_subimage)))) { - glPixelStorei (GL_UNPACK_ALIGNMENT, bpp); glPixelStorei (GL_UNPACK_ROW_LENGTH, stride / bpp); 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 { |