zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-26 08:02:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Return results for fallible media APIs

Browse Source
This commit is contained in:
Antonio Scandurra 2022-08-31 11:09:14 +02:00
parent 79a7a0e0e7
commit fcf6aa15eb
6 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -3033,6 +3033,7 @@ dependencies = [
name = "media"
version = "0.1.0"
dependencies = [
"anyhow",
"bindgen",
"block",
"core-foundation",

21
crates/gpui/src/platform/mac/renderer.rs
View File

@ -132,7 +132,7 @@ impl Renderer {
"underline_fragment",
pixel_format,
);
let cv_texture_cache = CVMetalTextureCache::new(device.as_ptr());
let cv_texture_cache = CVMetalTextureCache::new(device.as_ptr()).unwrap();
Self {
sprite_cache,
image_cache,
@ -825,14 +825,17 @@ impl Renderer {
panic!("unsupported pixel format")
};
let texture = self.cv_texture_cache.create_texture_from_image(
surface.image_buffer.as_concrete_TypeRef(),
ptr::null(),
pixel_format,
source_size.x() as usize,
source_size.y() as usize,
0,
);
let texture = self
.cv_texture_cache
.create_texture_from_image(
surface.image_buffer.as_concrete_TypeRef(),
ptr::null(),
pixel_format,
source_size.x() as usize,
source_size.y() as usize,
0,
)
.unwrap();
align_offset(offset);
let next_offset = *offset + mem::size_of::<shaders::GPUIImage>();

1
crates/media/Cargo.toml
View File

@ -8,6 +8,7 @@ path = "src/media.rs"
doctest = false
[dependencies]
anyhow = "1.0"
block = "0.1"
core-foundation = "0.9.3"
foreign-types = "0.3"

1
crates/media/build.rs
View File

@ -17,6 +17,7 @@ fn main() {
.clang_arg(format!("-isysroot{}", sdk_path))
.clang_arg("-xobjective-c")
.allowlist_var("kCVPixelFormatType_.*")
.allowlist_var("kCVReturn.*")
.parse_callbacks(Box::new(bindgen::CargoCallbacks))
.layout_tests(false)
.generate()

3
crates/media/src/bindings.h
View File

@ -1 +1,2 @@
#import <CoreVideo/CVPixelFormatDescription.h>
#import <CoreVideo/CVPixelFormatDescription.h>
#import <CoreVideo/CVReturn.h>

28
crates/media/src/media.rs
View File

@ -33,16 +33,16 @@ pub mod io_surface {
pub mod core_video {
#![allow(non_snake_case)]
use std::ptr;
use super::*;
pub use crate::bindings::*;
use anyhow::{anyhow, Result};
use core_foundation::{
base::kCFAllocatorDefault, dictionary::CFDictionaryRef, mach_port::CFAllocatorRef,
};
use foreign_types::ForeignTypeRef;
use io_surface::{IOSurface, IOSurfaceRef};
use metal::{MTLDevice, MTLPixelFormat, MTLTexture};
use metal::{MTLDevice, MTLPixelFormat};
use std::ptr;
#[repr(C)]
pub struct __CVImageBuffer(c_void);
@ -97,7 +97,7 @@ pub mod core_video {
impl_CFTypeDescription!(CVMetalTextureCache);
impl CVMetalTextureCache {
pub fn new(metal_device: *mut MTLDevice) -> Self {
pub fn new(metal_device: *mut MTLDevice) -> Result<Self> {
unsafe {
let mut this = ptr::null();
let result = CVMetalTextureCacheCreate(
@ -107,8 +107,11 @@ pub mod core_video {
ptr::null_mut(),
&mut this,
);
// TODO: Check result
CVMetalTextureCache::wrap_under_create_rule(this)
if result == kCVReturnSuccess {
Ok(CVMetalTextureCache::wrap_under_create_rule(this))
} else {
Err(anyhow!("could not create texture cache, code: {}", result))
}
}
}
@ -120,7 +123,7 @@ pub mod core_video {
width: usize,
height: usize,
plane_index: usize,
) -> CVMetalTexture {
) -> Result<CVMetalTexture> {
unsafe {
let mut this = ptr::null();
let result = CVMetalTextureCacheCreateTextureFromImage(
@ -134,8 +137,11 @@ pub mod core_video {
plane_index,
&mut this,
);
// TODO: Check result
CVMetalTexture::wrap_under_create_rule(this)
if result == kCVReturnSuccess {
Ok(CVMetalTexture::wrap_under_create_rule(this))
} else {
Err(anyhow!("could not create texture, code: {}", result))
}
}
}
}
@ -149,7 +155,7 @@ pub mod core_video {
metal_device: *const MTLDevice,
texture_attributes: CFDictionaryRef,
cache_out: *mut CVMetalTextureCacheRef,
) -> i32; // TODO: This should be a CVReturn enum
) -> CVReturn;
fn CVMetalTextureCacheCreateTextureFromImage(
allocator: CFAllocatorRef,
texture_cache: CVMetalTextureCacheRef,
@ -160,7 +166,7 @@ pub mod core_video {
height: usize,
plane_index: usize,
texture_out: *mut CVMetalTextureRef,
) -> i32;
) -> CVReturn;
}
#[repr(C)]