AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'fix-rgb-upload' into 'master'

Browse Source 
gl: Fix RGB uploads

Closes #3194

See merge request GNOME/gtk!2620
This commit is contained in:
Matthias Clasen 2020-09-26 00:30:31 +00:00
commit 1b93108d10
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdk/gdkglcontext.c
View File

@ -291,7 +291,10 @@ gdk_gl_context_upload_texture (GdkGLContext *context,
*/ */
if (stride == width * bpp) if (stride == width * bpp)
{ {
glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
glTexImage2D (texture_target, 0, GL_RGBA, width, height, 0, gl_format, gl_type, data); glTexImage2D (texture_target, 0, GL_RGBA, width, height, 0, gl_format, gl_type, data);
glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
} }
else if ((!priv->use_es || else if ((!priv->use_es ||
(priv->use_es && (priv->gl_version >= 30 || priv->has_unpack_subimage)))) (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); glTexImage2D (texture_target, 0, GL_RGBA, width, height, 0, gl_format, gl_type, data);
glPixelStorei (GL_UNPACK_ROW_LENGTH, 0); glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
} }
else else
{ {