fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-03 05:38:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nak: Implement DisplayOp on Op instead of Display

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26291>
This commit is contained in:
Faith Ekstrand 2023-11-20 10:16:20 -06:00 • committed by Marge Bot
parent 9d1afb7533
commit 58c8391f97
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4261,7 +4261,7 @@ impl DisplayOp for OpOutFinal {
}
impl_display_for_op!(OpOutFinal);
#[derive(Display, DstsAsSlice, SrcsAsSlice, FromVariants)]
#[derive(DisplayOp, DstsAsSlice, SrcsAsSlice, FromVariants)]
pub enum Op {
FAdd(OpFAdd),
FFma(OpFFma),
@ -4339,6 +4339,7 @@ pub enum Op {
Out(OpOut),
OutFinal(OpOutFinal),
}
impl_display_for_op!(Op);
#[derive(Clone, Copy, Eq, Hash, PartialEq)]
pub enum PredRef {

26
src/nouveau/compiler/nak_ir_proc.rs
View file

@ -251,23 +251,33 @@ pub fn derive_dsts_as_slice(input: TokenStream) -> TokenStream {
derive_as_slice(input, "DstsAsSlice", "dsts", "Dst")
}
#[proc_macro_derive(Display)]
pub fn enum_derive_display(input: TokenStream) -> TokenStream {
#[proc_macro_derive(DisplayOp)]
pub fn enum_derive_display_op(input: TokenStream) -> TokenStream {
let DeriveInput { ident, data, .. } = parse_macro_input!(input);
if let Data::Enum(e) = data {
let mut cases = TokenStream2::new();
let mut fmt_dsts_cases = TokenStream2::new();
let mut fmt_op_cases = TokenStream2::new();
for v in e.variants {
let case = v.ident;
cases.extend(quote! {
#ident::#case(x) => x.fmt(f),
fmt_dsts_cases.extend(quote! {
#ident::#case(x) => x.fmt_dsts(f),
});
fmt_op_cases.extend(quote! {
#ident::#case(x) => x.fmt_op(f),
});
}
quote! {
impl fmt::Display for #ident {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
impl DisplayOp for #ident {
fn fmt_dsts(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self {
#cases
#fmt_dsts_cases
}
}
fn fmt_op(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self {
#fmt_op_cases
}
}
}