From: Timm Bäder Date: Tue, 17 Dec 2019 11:27:35 +0000 (+0100) Subject: gl renderer: Shuffle things around a bit X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~20^2~426 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c79c18f39ce30d17408728213a64fe7caa1a4b3c;p=gtk4.git gl renderer: Shuffle things around a bit --- diff --git a/gsk/resources/glsl/preamble.fs.glsl b/gsk/resources/glsl/preamble.fs.glsl index 569de0ab62..00a8c2135e 100644 --- a/gsk/resources/glsl/preamble.fs.glsl +++ b/gsk/resources/glsl/preamble.fs.glsl @@ -12,14 +12,6 @@ uniform mat4 u_projection; uniform mat4 u_modelview; uniform float u_alpha;// = 1.0; uniform vec4 u_viewport; - -struct RoundedRect -{ - vec4 bounds; - vec4 corner_widths; - vec4 corner_heights; -}; - uniform vec4[3] u_clip_rect; #if GSK_GLES @@ -36,6 +28,15 @@ _OUT_ vec4 outputColor; #endif _IN_ vec2 vUv; + + +struct RoundedRect +{ + vec4 bounds; + vec4 corner_widths; + vec4 corner_heights; +}; + // Transform from a GskRoundedRect to a RoundedRect as we need it. RoundedRect create_rect(vec4 data[3])