debian/changelog | 5 + debian/patches/glamor-Declare-pos-in-the-composite-glyph.diff | 47 ++++++++++ debian/patches/series | 1 3 files changed, 53 insertions(+)
New commits: commit 56eef40f2b9f6b1c1864767521918c8a3bf7aa9e Author: Andreas Boll <[email protected]> Date: Tue Sep 6 14:39:15 2016 +0200 Add glamor-Declare-pos-in-the-composite-glyph.diff from upstream (Closes: #834054). diff --git a/debian/changelog b/debian/changelog index 5b2916b..0aec240 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,14 @@ xorg-server (2:1.18.4-2) UNRELEASED; urgency=medium + [ Julien Cristau ] * Adjust bug script to look for log files in $HOME/.local/share/xorg in addition to /var/log, to handle unprivileged Xorg. * Update a bunch of URLs in packaging to https. + [ Andreas Boll ] + * Add glamor-Declare-pos-in-the-composite-glyph.diff from upstream + (Closes: #834054). + -- Julien Cristau <[email protected]> Tue, 02 Aug 2016 10:30:00 +0200 xorg-server (2:1.18.4-1) unstable; urgency=medium diff --git a/debian/patches/glamor-Declare-pos-in-the-composite-glyph.diff b/debian/patches/glamor-Declare-pos-in-the-composite-glyph.diff new file mode 100644 index 0000000..73eac9b --- /dev/null +++ b/debian/patches/glamor-Declare-pos-in-the-composite-glyph.diff @@ -0,0 +1,47 @@ +commit be334f42a198a25e817e6dab43dd0e30aa1cd4f8 +Author: Michel Dänzer <[email protected]> +Date: Thu Aug 18 09:40:34 2016 +0900 + + glamor: Declare "pos" in the composite glyph GLSL 1.20 vertex shader + + Fixes shader compile failure: + + Failed to compile VS: 0:13(43): error: `pos' undeclared + 0:13(14): error: operands to arithmetic operators must be numeric + 0:13(13): error: operands to arithmetic operators must be numeric + + Program source: + #define ATLAS_DIM_INV 0.000976562500000000 + attribute vec2 primitive; + attribute vec2 source; + varying vec2 glyph_pos; + uniform vec2 fill_offset; + uniform vec2 fill_size_inv; + varying vec2 fill_pos; + uniform vec4 v_matrix; + void main() { + gl_Position.xy = primitive.xy * v_matrix.xz + v_matrix.yw; + gl_Position.zw = vec2(0.0,1.0); + glyph_pos = source.xy * ATLAS_DIM_INV; + fill_pos = (fill_offset + primitive.xy + pos) * fill_size_inv; + } + (EE) Fatal server error: + (EE) GLSL compile failure + + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97300 + Reviewed-by: Keith Packard <[email protected]> + +diff --git a/glamor/glamor_composite_glyphs.c b/glamor/glamor_composite_glyphs.c +index cc0aa6f..b651274 100644 +--- a/glamor/glamor_composite_glyphs.c ++++ b/glamor/glamor_composite_glyphs.c +@@ -199,7 +199,8 @@ static const glamor_facet glamor_facet_composite_glyphs_120 = { + .vs_vars = ("attribute vec2 primitive;\n" + "attribute vec2 source;\n" + "varying vec2 glyph_pos;\n"), +- .vs_exec = (GLAMOR_POS(gl_Position, primitive) ++ .vs_exec = (" vec2 pos = vec2(0,0);\n" ++ GLAMOR_POS(gl_Position, primitive.xy) + " glyph_pos = source.xy * ATLAS_DIM_INV;\n"), + .fs_vars = ("varying vec2 glyph_pos;\n"), + .fs_exec = (" vec4 mask = texture2D(atlas, glyph_pos);\n"), diff --git a/debian/patches/series b/debian/patches/series index 55da92c..a4114c3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ 03_static-nettle.diff 05_Revert-Unload-submodules.diff 06_use-intel-only-on-pre-gen4.diff +glamor-Declare-pos-in-the-composite-glyph.diff
