fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-03 22:20:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nak: Rework OpALd and OpASt a bit

Browse source 
Replace the out_load flag with an output flag which we now require to be
set for OpASt.  Also, improve printing so we add .O and .P qualifiers as
needed.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24998>
This commit is contained in:
Faith Ekstrand 2023-09-30 18:03:10 -05:00 • committed by Marge Bot
parent f5805dadab
commit f097303a99
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/nouveau/compiler/nak_encode_sm75.rs
View file

@ -1489,7 +1489,7 @@ impl SM75Instr {
self.set_field(74..76, op.access.comps - 1);
self.set_field(76..77, op.access.patch);
self.set_field(77..78, op.access.flags);
self.set_field(79..80, op.access.out_load);
self.set_field(79..80, op.access.output);
}
fn encode_ast(&mut self, op: &OpASt) {
@ -1503,7 +1503,7 @@ impl SM75Instr {
self.set_field(74..76, op.access.comps - 1);
self.set_field(76..77, op.access.patch);
self.set_field(77..78, op.access.flags);
assert!(!op.access.out_load);
assert!(op.access.output);
}
fn encode_ipa(&mut self, op: &OpIpa) {

4
src/nouveau/compiler/nak_from_nir.rs
View file

@ -1421,7 +1421,7 @@ impl<'a> ShaderFromNir<'a> {
addr: addr,
comps: comps,
patch: false,
out_load: false,
output: false,
flags: 0,
};
@ -1758,7 +1758,7 @@ impl<'a> ShaderFromNir<'a> {
addr: addr,
comps: comps,
patch: false,
out_load: false,
output: true,
flags: 0,
};

17
src/nouveau/compiler/nak_ir.rs
View file

@ -1919,7 +1919,7 @@ pub struct AttrAccess {
pub addr: u16,
pub comps: u8,
pub patch: bool,
pub out_load: bool,
pub output: bool,
pub flags: u8,
}
@ -3328,7 +3328,14 @@ pub struct OpALd {
impl fmt::Display for OpALd {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "ALD {} a", self.dst)?;
write!(f, "ALD")?;
if self.access.output {
write!(f, ".O")?;
}
if self.access.patch {
write!(f, ".P")?;
}
write!(f, " {} a", self.dst)?;
if !self.vtx.is_zero() {
write!(f, "[{}]", self.vtx)?;
}
@ -3357,7 +3364,11 @@ pub struct OpASt {
impl fmt::Display for OpASt {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "AST a")?;
write!(f, "AST")?;
if self.access.patch {
write!(f, ".P")?;
}
write!(f, " a")?;
if !self.vtx.is_zero() {
write!(f, "[{}]", self.vtx)?;
}