Merge upstream master branch

[Hanaasagi]

Update to alacritty@c435b94 for alacritty 0.13.0-dev.

Unable to be auto-merged, I fixed the following conflicts.

diff --cc alacritty/src/renderer/mod.rs
index 1f6aa672,8f708d33..00000000
--- a/alacritty/src/renderer/mod.rs
+++ b/alacritty/src/renderer/mod.rs
@@@ -18,7 -20,7 +22,11 @@@ use crate::renderer::graphics::Graphics
  use crate::renderer::rects::{RectRenderer, RenderRect};
  use crate::renderer::shader::ShaderError;

++<<<<<<< HEAD
 +pub mod graphics;
++=======
+ pub mod platform;
++>>>>>>> c435b94b11cb470a090d0e64a62a3f63348211f5
  pub mod rects;
  mod shader;
  mod text;
@@@ -93,20 -110,28 +117,35 @@@ impl Renderer

          info!("Running on {}", renderer);

++<<<<<<< HEAD
 +        let (text_renderer, rect_renderer, graphics_renderer) = if version.as_ref() >= "3.3" {
++=======
+         let is_gles_context = matches!(context.context_api(), ContextApi::Gles(_));
+
+         // Use the config option to enforce a particular renderer configuration.
+         let (use_glsl3, allow_dsb) = match renderer_prefernce {
+             Some(RendererPreference::Glsl3) => (true, true),
+             Some(RendererPreference::Gles2) => (false, true),
+             Some(RendererPreference::Gles2Pure) => (false, false),
+             None => (version.as_ref() >= "3.3" && !is_gles_context, true),
+         };
+
+         let (text_renderer, rect_renderer) = if use_glsl3 {
++>>>>>>> c435b94b11cb470a090d0e64a62a3f63348211f5

Take a look at https://github.com/Hanaasagi/alacritty-sixel/blob/bb0d982084f23dfba99740414bc1d8bad03f0875/alacritty/src/renderer/mod.rs#L115-L132

And ShaderProgram::new method has a new argument shader_header, this was added by alacritty@5b1dd38. I pass None value in https://github.com/Hanaasagi/alacritty-sixel/blob/bb0d982084f23dfba99740414bc1d8bad03f0875/alacritty/src/renderer/graphics/shader.rs#L86