diff --git a/src/nouveau/compiler/bitview/lib.rs b/src/nouveau/compiler/bitview/lib.rs index b0ee59295bf..d76e36a2f9d 100644 --- a/src/nouveau/compiler/bitview/lib.rs +++ b/src/nouveau/compiler/bitview/lib.rs @@ -246,7 +246,7 @@ pub trait SetFieldU64 { fn set_field_u64(&mut self, range: Range, val: u64); } -impl<'a, BS: BitMutViewable + ?Sized> SetFieldU64 for BitMutView<'a, BS> { +impl<'a, BS: BitMutViewable> SetFieldU64 for BS { fn set_field_u64(&mut self, range: Range, val: u64) { let bits = range.end - range.start; diff --git a/src/nouveau/compiler/nak/sm20.rs b/src/nouveau/compiler/nak/sm20.rs index acbbf65bb7e..7d503f20231 100644 --- a/src/nouveau/compiler/nak/sm20.rs +++ b/src/nouveau/compiler/nak/sm20.rs @@ -7,7 +7,6 @@ use crate::legalize::{ }; use bitview::{ BitMutView, BitMutViewable, BitView, BitViewable, SetBit, SetField, - SetFieldU64, }; use rustc_hash::FxHashMap; @@ -212,12 +211,6 @@ impl BitMutViewable for SM20Encoder<'_> { } } -impl SetFieldU64 for SM20Encoder<'_> { - fn set_field_u64(&mut self, range: Range, val: u64) { - BitMutView::new(&mut self.inst).set_field_u64(range, val); - } -} - impl SM20Encoder<'_> { fn set_opcode(&mut self, unit: SM20Unit, opcode: u8) { self.set_field(0..3, unit as u8); diff --git a/src/nouveau/compiler/nak/sm32.rs b/src/nouveau/compiler/nak/sm32.rs index feb923f987b..71e9838ba6e 100644 --- a/src/nouveau/compiler/nak/sm32.rs +++ b/src/nouveau/compiler/nak/sm32.rs @@ -8,7 +8,6 @@ use crate::legalize::{ }; use bitview::{ BitMutView, BitMutViewable, BitView, BitViewable, SetBit, SetField, - SetFieldU64, }; use rustc_hash::FxHashMap; @@ -177,12 +176,6 @@ impl BitMutViewable for SM32Encoder<'_> { } } -impl SetFieldU64 for SM32Encoder<'_> { - fn set_field_u64(&mut self, range: Range, val: u64) { - BitMutView::new(&mut self.inst).set_field_u64(range, val); - } -} - impl SM32Encoder<'_> { fn set_opcode(&mut self, opcode: u16, functional_unit: u8) { self.set_field(52..64, opcode); diff --git a/src/nouveau/compiler/nak/sm50.rs b/src/nouveau/compiler/nak/sm50.rs index 23f6c4c1af9..5cbbe97ed4e 100644 --- a/src/nouveau/compiler/nak/sm50.rs +++ b/src/nouveau/compiler/nak/sm50.rs @@ -200,12 +200,6 @@ impl BitMutViewable for SM50Encoder<'_> { } } -impl SetFieldU64 for SM50Encoder<'_> { - fn set_field_u64(&mut self, range: Range, val: u64) { - BitMutView::new(&mut self.inst).set_field_u64(range, val); - } -} - fn zero_reg() -> RegRef { RegRef::new(RegFile::GPR, 255, 1) } diff --git a/src/nouveau/compiler/nak/sm70_encode.rs b/src/nouveau/compiler/nak/sm70_encode.rs index 17227788cda..849b801504e 100644 --- a/src/nouveau/compiler/nak/sm70_encode.rs +++ b/src/nouveau/compiler/nak/sm70_encode.rs @@ -40,12 +40,6 @@ impl BitMutViewable for SM70Encoder<'_> { } } -impl SetFieldU64 for SM70Encoder<'_> { - fn set_field_u64(&mut self, range: Range, val: u64) { - BitMutView::new(&mut self.inst).set_field_u64(range, val); - } -} - impl SM70Encoder<'_> { /// Maximum encodable UGPR /// diff --git a/src/nouveau/compiler/nak/sph.rs b/src/nouveau/compiler/nak/sph.rs index a1d3a3f752d..36fd8768efb 100644 --- a/src/nouveau/compiler/nak/sph.rs +++ b/src/nouveau/compiler/nak/sph.rs @@ -7,7 +7,6 @@ extern crate nvidia_headers; use crate::ir::{ShaderInfo, ShaderIoInfo, ShaderModel, ShaderStageInfo}; use bitview::{ BitMutView, BitMutViewable, BitView, BitViewable, SetBit, SetField, - SetFieldU64, }; use nak_bindings::*; use nvidia_headers::classes::cla097::sph::*; @@ -91,12 +90,6 @@ impl BitMutViewable for ShaderProgramHeader { } } -impl SetFieldU64 for ShaderProgramHeader { - fn set_field_u64(&mut self, range: Range, val: u64) { - BitMutView::new(&mut self.data).set_field_u64(range, val); - } -} - impl ShaderProgramHeader { pub fn new(shader_type: ShaderType, sm: u8) -> Self { let mut res = Self {