mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-25 01:34:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

WIP

Browse source
This commit is contained in:
Antonio Scandurra 2024-11-08 12:54:27 +01:00
parent 2fe9cd8faa
commit df43eb9590
2 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
crates/gpui/src/platform/mac/metal_renderer.rs
View file

@ -13,6 +13,7 @@ use cocoa::{
};
use collections::HashMap;
use core_foundation::base::TCFType;
use core_graphics::{color_space::kCGColorSpaceSRGB, color_space::CGColorSpace};
use foreign_types::ForeignType;
use media::core_video::CVMetalTextureCache;
use metal::{CAMetalLayer, CommandQueue, MTLPixelFormat, MTLResourceOptions, NSRange};
@ -121,10 +122,12 @@ impl MetalRenderer {
let layer = metal::MetalLayer::new();
layer.set_device(&device);
layer.set_pixel_format(MTLPixelFormat::BGRA8Unorm);
layer.set_pixel_format(MTLPixelFormat::BGRA8Unorm_sRGB);
layer.set_opaque(false);
layer.set_maximum_drawable_count(3);
unsafe {
let color_space = CGColorSpace::create_with_name(kCGColorSpaceSRGB);
let _: () = msg_send![&*layer, setColorspace: color_space];
let _: () = msg_send![&*layer, setAllowsNextDrawableTimeout: NO];
let _: () = msg_send![&*layer, setNeedsDisplayOnBoundsChange: YES];
let _: () = msg_send![
@ -177,7 +180,7 @@ impl MetalRenderer {
"path_sprites",
"path_sprite_vertex",
"path_sprite_fragment",
MTLPixelFormat::BGRA8Unorm,
MTLPixelFormat::BGRA8Unorm_sRGB,
);
let shadows_pipeline_state = build_pipeline_state(
&device,
@ -185,7 +188,7 @@ impl MetalRenderer {
"shadows",
"shadow_vertex",
"shadow_fragment",
MTLPixelFormat::BGRA8Unorm,
MTLPixelFormat::BGRA8Unorm_sRGB,
);
let quads_pipeline_state = build_pipeline_state(
&device,
@ -193,7 +196,7 @@ impl MetalRenderer {
"quads",
"quad_vertex",
"quad_fragment",
MTLPixelFormat::BGRA8Unorm,
MTLPixelFormat::BGRA8Unorm_sRGB,
);
let underlines_pipeline_state = build_pipeline_state(
&device,
@ -201,7 +204,7 @@ impl MetalRenderer {
"underlines",
"underline_vertex",
"underline_fragment",
MTLPixelFormat::BGRA8Unorm,
MTLPixelFormat::BGRA8Unorm_sRGB,
);
let monochrome_sprites_pipeline_state = build_pipeline_state(
&device,
@ -209,7 +212,7 @@ impl MetalRenderer {
"monochrome_sprites",
"monochrome_sprite_vertex",
"monochrome_sprite_fragment",
MTLPixelFormat::BGRA8Unorm,
MTLPixelFormat::BGRA8Unorm_sRGB,
);
let polychrome_sprites_pipeline_state = build_pipeline_state(
&device,

13
crates/gpui/src/platform/mac/shaders.metal
View file

@ -526,6 +526,12 @@ fragment float4 surface_fragment(SurfaceFragmentInput input [[stage_in]],
return ycbcrToRGBTransform * ycbcr;
}
float3 srgb_to_linear(float3 c) {
float3 low = c / 12.92;
float3 high = pow((c + 0.055) / 1.055, float3(2.4));
return mix(low, high, step(0.04045, c));
}
float4 hsla_to_rgba(Hsla hsla) {
float h = hsla.h * 6.0; // Now, it's an angle but scaled in [0, 6) range
float s = hsla.s;
@ -566,12 +572,7 @@ float4 hsla_to_rgba(Hsla hsla) {
b = x;
}
float4 rgba;
rgba.x = (r + m);
rgba.y = (g + m);
rgba.z = (b + m);
rgba.w = a;
return rgba;
return float4(srgb_to_linear(float3(r, g, b) + m), a);
}
float4 to_device_position(float2 unit_vertex, Bounds_ScaledPixels bounds,