From 29a7d924c7a4f5d819b961c1cd3bd0c2060789a5 Mon Sep 17 00:00:00 2001 From: Matt Coster Date: Thu, 26 May 2022 10:04:40 +0100 Subject: [PATCH] pvr: csbgen: Make all generated enums unambiguous This change involves two enums: * rogue_texstate.xml: All COMPRESSED_* members of FORMAT are moved to FORMAT_COMPRESSED (without the prefix). A second field is added to IMAGE_WORD0 (texformat_compressed) which overlaps with the original (texformat), and * rogue_pbestate.xml: REG_WORD0_LINESTRIDE was not a real enum; it's removed entirely. It only has value when feature pbe_stride_align_1pixel is present, so a FIXME comment was added to this effect. Signed-off-by: Matt Coster Reviewed-by: Karmjit Mahil Part-of: --- src/imagination/csbgen/rogue_pbestate.xml | 8 +--- src/imagination/csbgen/rogue_texstate.xml | 75 ++++++++++++++++--------------- 2 files changed, 41 insertions(+), 42 deletions(-) diff --git a/src/imagination/csbgen/rogue_pbestate.xml b/src/imagination/csbgen/rogue_pbestate.xml index 29346d2..6e3d290 100644 --- a/src/imagination/csbgen/rogue_pbestate.xml +++ b/src/imagination/csbgen/rogue_pbestate.xml @@ -127,13 +127,6 @@ SOFTWARE. - - - - - - - @@ -263,6 +256,7 @@ SOFTWARE. + diff --git a/src/imagination/csbgen/rogue_texstate.xml b/src/imagination/csbgen/rogue_texstate.xml index f11eab4..8f2fc0f 100644 --- a/src/imagination/csbgen/rogue_texstate.xml +++ b/src/imagination/csbgen/rogue_texstate.xml @@ -189,44 +189,48 @@ SOFTWARE. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -262,6 +266,7 @@ SOFTWARE. + -- 2.7.4