github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

[naga spv-out] Rename get_pointer_id to get_pointer_type_id.

Browse Source
This commit is contained in:
Jim Blandy
2025-02-27 09:51:02 -08:00
parent 0cb8e26922
commit 77265d38cd
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
naga/src/back/spv/index.rs
View File

@@ -226,7 +226,7 @@ impl BlockContext<'_> {
let element_type_id = match self.ir_module.types[global.ty].inner {
crate::TypeInner::BindingArray { base, size: _ } => {
let class = map_storage_class(global.space);
self.get_pointer_id(base, class)
self.get_pointer_type_id(base, class)
}
_ => return Err(Error::Validation("array length expression case-5")),
};

4
naga/src/back/spv/mod.rs
View File

@@ -761,8 +761,8 @@ impl BlockContext<'_> {
.get_constant_scalar(crate::Literal::I32(scope as _))
}
fn get_pointer_id(&mut self, handle: Handle<crate::Type>, class: spirv::StorageClass) -> Word {
self.writer.get_pointer_id(handle, class)
fn get_pointer_type_id(&mut self, handle: Handle<crate::Type>, class: spirv::StorageClass) -> Word {
self.writer.get_pointer_type_id(handle, class)
}
}

14
naga/src/back/spv/writer.rs
View File

@@ -240,7 +240,7 @@ impl Writer {
self.get_type_id(LookupType::Local(local))
}
pub(super) fn get_pointer_id(
pub(super) fn get_pointer_type_id(
&mut self,
handle: Handle<crate::Type>,
class: spirv::StorageClass,
@@ -285,7 +285,7 @@ impl Writer {
class: spirv::StorageClass,
) -> Word {
match *resolution {
TypeResolution::Handle(handle) => self.get_pointer_id(handle, class),
TypeResolution::Handle(handle) => self.get_pointer_type_id(handle, class),
TypeResolution::Value(ref inner) => {
let base = NumericType::from_inner(inner).unwrap();
self.get_type_id(LookupType::Local(LocalType::LocalPointer { base, class }))
@@ -638,7 +638,7 @@ impl Writer {
let class = spirv::StorageClass::Input;
let handle_ty = ir_module.types[argument.ty].inner.is_handle();
let argument_type_id = match handle_ty {
true => self.get_pointer_id(argument.ty, spirv::StorageClass::UniformConstant),
true => self.get_pointer_type_id(argument.ty, spirv::StorageClass::UniformConstant),
false => self.get_type_id(LookupType::Handle(argument.ty)),
};
@@ -869,7 +869,7 @@ impl Writer {
gv.handle_id = id;
} else if global_needs_wrapper(ir_module, var) {
let class = map_storage_class(var.space);
let pointer_type_id = self.get_pointer_id(var.ty, class);
let pointer_type_id = self.get_pointer_type_id(var.ty, class);
let index_id = self.get_index_constant(0);
let id = self.id_gen.next();
prelude.body.push(Instruction::access_chain(
@@ -931,7 +931,7 @@ impl Writer {
let init_word = variable.init.map(|constant| context.cached[constant]);
let pointer_type_id = context
.writer
.get_pointer_id(variable.ty, spirv::StorageClass::Function);
.get_pointer_type_id(variable.ty, spirv::StorageClass::Function);
let instruction = Instruction::variable(
pointer_type_id,
id,
@@ -1756,7 +1756,7 @@ impl Writer {
binding: &crate::Binding,
) -> Result<Word, Error> {
let id = self.id_gen.next();
let pointer_type_id = self.get_pointer_id(ty, class);
let pointer_type_id = self.get_pointer_type_id(ty, class);
Instruction::variable(pointer_type_id, id, class, None)
.to_words(&mut self.logical_layout.declarations);
@@ -2089,7 +2089,7 @@ impl Writer {
if substitute_inner_type_lookup.is_some() {
inner_type_id
} else {
self.get_pointer_id(global_variable.ty, class)
self.get_pointer_type_id(global_variable.ty, class)
}
};