diff --git a/.travis.yml b/.travis.yml index 171e10930d..8bd6330e7f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,3 +8,8 @@ os: branches: except: - staging.tmp + +script: + - cargo test + - if [[ $TRAVIS_OS_NAME == "linux" ]]; then cargo test --no-run --features vulkan; fi + - if [[ $TRAVIS_OS_NAME == "windows" ]]; then cargo test --no-run --features vulkan; fi diff --git a/wgpu/tests/multithreaded_compute.rs b/wgpu/tests/multithreaded_compute.rs index 045f16c382..d0ac55e316 100644 --- a/wgpu/tests/multithreaded_compute.rs +++ b/wgpu/tests/multithreaded_compute.rs @@ -13,16 +13,17 @@ fn multithreaded_compute() { thread::spawn(move || { let numbers = vec!(100, 100, 100); - let size = (numbers.len() * std::mem::size_of::()) as u32; + let size = (numbers.len() * std::mem::size_of::()) as wgpu::BufferAddress; let instance = wgpu::Instance::new(); let adapter = instance.get_adapter(&wgpu::AdapterDescriptor { power_preference: wgpu::PowerPreference::Default, }); - let mut device = adapter.create_device(&wgpu::DeviceDescriptor { + let mut device = adapter.request_device(&wgpu::DeviceDescriptor { extensions: wgpu::Extensions { anisotropic_filtering: false, }, + limits: wgpu::Limits::default(), }); let cs_bytes = include_bytes!("../examples/hello-compute/shader.comp.spv"); @@ -31,23 +32,23 @@ fn multithreaded_compute() { let staging_buffer = device .create_buffer_mapped( numbers.len(), - wgpu::BufferUsageFlags::MAP_READ - | wgpu::BufferUsageFlags::TRANSFER_DST - | wgpu::BufferUsageFlags::TRANSFER_SRC, + wgpu::BufferUsage::MAP_READ + | wgpu::BufferUsage::TRANSFER_DST + | wgpu::BufferUsage::TRANSFER_SRC, ) .fill_from_slice(&numbers); let storage_buffer = device.create_buffer(&wgpu::BufferDescriptor { size, - usage: wgpu::BufferUsageFlags::STORAGE - | wgpu::BufferUsageFlags::TRANSFER_DST - | wgpu::BufferUsageFlags::TRANSFER_SRC, + usage: wgpu::BufferUsage::STORAGE + | wgpu::BufferUsage::TRANSFER_DST + | wgpu::BufferUsage::TRANSFER_SRC, }); let bind_group_layout = device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor { bindings: &[wgpu::BindGroupLayoutBinding { binding: 0, - visibility: wgpu::ShaderStageFlags::COMPUTE, + visibility: wgpu::ShaderStage::COMPUTE, ty: wgpu::BindingType::StorageBuffer, }], });