diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2017-09-22 17:54:24 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2017-09-22 17:54:24 -0400 |
| commit | 1a7faa5e6b8a32d06311b68f39063a340d28236b (patch) | |
| tree | 729a72da4945afac944791d27558af6313258d32 | |
| parent | 2a4070fa8a3e7146777362acfda9fa841501d5de (diff) | |
| download | gtk+-1a7faa5e6b8a32d06311b68f39063a340d28236b.tar.gz | |
Use simpler math for crossfade
Just mix it.
| -rw-r--r-- | gsk/resources/vulkan/crossfade-clip-rounded.frag.spv | bin | 9060 -> 8656 bytes | |||
| -rw-r--r-- | gsk/resources/vulkan/crossfade-clip.frag.spv | bin | 2168 -> 1716 bytes | |||
| -rw-r--r-- | gsk/resources/vulkan/crossfade.frag | 3 | ||||
| -rw-r--r-- | gsk/resources/vulkan/crossfade.frag.spv | bin | 2168 -> 1716 bytes |
4 files changed, 1 insertions, 2 deletions
diff --git a/gsk/resources/vulkan/crossfade-clip-rounded.frag.spv b/gsk/resources/vulkan/crossfade-clip-rounded.frag.spv Binary files differindex ed3a07a85b..915406132e 100644 --- a/gsk/resources/vulkan/crossfade-clip-rounded.frag.spv +++ b/gsk/resources/vulkan/crossfade-clip-rounded.frag.spv diff --git a/gsk/resources/vulkan/crossfade-clip.frag.spv b/gsk/resources/vulkan/crossfade-clip.frag.spv Binary files differindex 52177dda49..0b0ac78d3c 100644 --- a/gsk/resources/vulkan/crossfade-clip.frag.spv +++ b/gsk/resources/vulkan/crossfade-clip.frag.spv diff --git a/gsk/resources/vulkan/crossfade.frag b/gsk/resources/vulkan/crossfade.frag index b40d318c98..90585729ee 100644 --- a/gsk/resources/vulkan/crossfade.frag +++ b/gsk/resources/vulkan/crossfade.frag @@ -15,7 +15,6 @@ void main() { vec4 start = texture (startTexture, inTexCoord); vec4 end = texture (endTexture, inTexCoord); - float alpha = mix (start.a, end.a, inProgress); - color = clip (inPos, vec4(mix (start.rgb, end.rgb, inProgress) / alpha, alpha)); + color = clip (inPos, mix (start, end, inProgress)); } diff --git a/gsk/resources/vulkan/crossfade.frag.spv b/gsk/resources/vulkan/crossfade.frag.spv Binary files differindex 52177dda49..0b0ac78d3c 100644 --- a/gsk/resources/vulkan/crossfade.frag.spv +++ b/gsk/resources/vulkan/crossfade.frag.spv |