nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-27 09:14:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings in snapshots and spv-in

Browse Source
This commit is contained in:
Dzmitry Malyshau 2021-09-14 09:41:05 -04:00 committed by Dzmitry Malyshau
parent c03427b154
commit db80ed4fa9
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/front/spv/mod.rs
View File

@ -268,7 +268,6 @@ struct EntryPoint {
name: String,
early_depth_test: Option<crate::EarlyDepthTest>,
workgroup_size: [u32; 3],
function_id: spirv::Word,
variable_ids: Vec<spirv::Word>,
}
@ -333,12 +332,6 @@ enum LookupLoadOverride {
Loaded(Handle<crate::Expression>),
}
#[derive(Clone, Debug)]
struct Assignment {
to: Handle<crate::Expression>,
value: Handle<crate::Expression>,
}
#[derive(PartialEq)]
enum ExtendedClass {
Global(crate::StorageClass),
@ -3397,7 +3390,6 @@ impl<I: Iterator<Item = u32>> Parser<I> {
name,
early_depth_test: None,
workgroup_size: [0; 3],
function_id,
variable_ids: self.data.by_ref().take(left as usize).collect(),
};
self.lookup_entry_point.insert(function_id, ep);

15
tests/snapshots.rs
View File

@ -1,7 +1,4 @@
//TODO: move this to a binary target once Rust supports
// binary-specific dependencies.
use std::{fs, path::Path, path::PathBuf};
use std::{fs, path::PathBuf};
const BASE_DIR_IN: &str = "tests/in";
const BASE_DIR_OUT: &str = "tests/out";
@ -169,7 +166,7 @@ fn check_targets(module: &naga::Module, name: &str, targets: Targets) {
fn write_output_spv(
module: &naga::Module,
info: &naga::valid::ModuleInfo,
destination: &Path,
destination: &PathBuf,
file_name: &str,
params: &Parameters,
) {
@ -226,7 +223,7 @@ fn write_output_spv(
fn write_output_msl(
module: &naga::Module,
info: &naga::valid::ModuleInfo,
destination: &Path,
destination: &PathBuf,
file_name: &str,
params: &Parameters,
) {
@ -263,7 +260,7 @@ fn write_output_msl(
fn write_output_glsl(
module: &naga::Module,
info: &naga::valid::ModuleInfo,
destination: &Path,
destination: &PathBuf,
file_name: &str,
stage: naga::ShaderStage,
ep_name: &str,
@ -304,7 +301,7 @@ fn write_output_glsl(
fn write_output_hlsl(
module: &naga::Module,
info: &naga::valid::ModuleInfo,
destination: &Path,
destination: &PathBuf,
file_name: &str,
params: &Parameters,
) {
@ -393,7 +390,7 @@ fn write_output_hlsl(
fn write_output_wgsl(
module: &naga::Module,
info: &naga::valid::ModuleInfo,
destination: &Path,
destination: &PathBuf,
file_name: &str,
) {
use naga::back::wgsl;