motiejus/zig
1
Fork 0
Code Releases Activity

spirv: make Type.Ref stronger

Browse Source 
Making Type.Ref an unbounded enum rather than a simple integer
ensures that we don't accidently confuse this token for another type.
This commit is contained in:
Robin Voetter
2022-11-26 01:05:37 +01:00
parent a60308f87c
commit 5826a8a064
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/codegen/spirv/Module.zig
View File

@@ -216,7 +216,7 @@ pub fn resolveType(self: *Module, ty: Type) !Type.Ref {
result.value_ptr.* = try self.emitType(ty);
}
return result.index;
return @intToEnum(Type.Ref, result.index);
}
pub fn resolveTypeId(self: *Module, ty: Type) !IdRef {
@@ -226,12 +226,12 @@ pub fn resolveTypeId(self: *Module, ty: Type) !IdRef {
/// Get the result-id of a particular type, by reference. Asserts type_ref is valid.
pub fn typeResultId(self: Module, type_ref: Type.Ref) IdResultType {
return self.type_cache.values()[type_ref];
return self.type_cache.values()[@enumToInt(type_ref)];
}
/// Get the result-id of a particular type as IdRef, by Type.Ref. Asserts type_ref is valid.
pub fn typeRefId(self: Module, type_ref: Type.Ref) IdRef {
return self.type_cache.values()[type_ref].toRef();
return self.type_cache.values()[@enumToInt(type_ref)].toRef();
}
/// Unconditionally emit a spir-v type into the appropriate section.