summarylogtreecommitdiffstats
path: root/0001-glamor-swizzle-RED-to-0-for-alpha-textures.patch
diff options
context:
space:
mode:
authorDet2016-03-16 22:29:24 +0200
committerDet2016-03-16 22:40:58 +0200
commit5fd80584cdc6d8570ea1fb8559b9b48d7e074bcc (patch)
tree4eac0a4036a905f56c98bf79964a653869f168e1 /0001-glamor-swizzle-RED-to-0-for-alpha-textures.patch
parentbfada26ecf355869252fc83c1fab123f4f6962f8 (diff)
downloadaur-5fd80584cdc6d8570ea1fb8559b9b48d7e074bcc.tar.gz
Upgpkg: 1.18.2-2: Arch repo update
"add upstream patches to fix a glamor regression and a log flooding issue" - https://projects.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/xorg-server&id=2cfaaed568ab8cf3c238e45ea582d3a5a3cae394
Diffstat (limited to '0001-glamor-swizzle-RED-to-0-for-alpha-textures.patch')
-rw-r--r--0001-glamor-swizzle-RED-to-0-for-alpha-textures.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/0001-glamor-swizzle-RED-to-0-for-alpha-textures.patch b/0001-glamor-swizzle-RED-to-0-for-alpha-textures.patch
new file mode 100644
index 000000000000..dc2e7ef4357a
--- /dev/null
+++ b/0001-glamor-swizzle-RED-to-0-for-alpha-textures.patch
@@ -0,0 +1,16 @@
+diff --git a/glamor/glamor_fbo.c b/glamor/glamor_fbo.c
+index a531f60..f4f8749 100644
+--- a/glamor/glamor_fbo.c
++++ b/glamor/glamor_fbo.c
+@@ -352,8 +352,10 @@ _glamor_create_tex(glamor_screen_private *glamor_priv,
+ glBindTexture(GL_TEXTURE_2D, tex);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+- if (format == glamor_priv->one_channel_format && format == GL_RED)
++ if (format == glamor_priv->one_channel_format && format == GL_RED) {
++ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_R, GL_ZERO);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_A, GL_RED);
++ }
+ glamor_priv->suppress_gl_out_of_memory_logging = true;
+ glTexImage2D(GL_TEXTURE_2D, 0, format, w, h, 0,
+ format, GL_UNSIGNED_BYTE, NULL);