[gtk/fix-texture-upload-more] More texture upload fixes
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/fix-texture-upload-more] More texture upload fixes
- Date: Sat, 26 Sep 2020 02:01:40 +0000 (UTC)
commit d6912a6791f178da16f2877d5885e9aaf3cf29b6
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Sep 25 21:59:33 2020 -0400
More texture upload fixes
In some cases, with bpp == 3 and a rowstride
that is divisible by 4, we were passing invalid
parameters to GL.
Fixes: #3198
gdk/gdkglcontext.c | 2 --
1 file changed, 2 deletions(-)
---
diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c
index 7f544dc003..d4359844a3 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
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]