Mesa (main): intel: Rename a RenderCompressionFormat field

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: fde43bb194ddc83df4575923e09ea1ee670d59f9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fde43bb194ddc83df4575923e09ea1ee670d59f9

Author: Nanley Chery <nanley.g.chery at intel.com>
Date:   Wed Dec 29 09:41:54 2021 -0500

intel: Rename a RenderCompressionFormat field

The name of the bit field is CompressionFormat. The format subsections
of the field specify the alternate names of RenderCompressionFormat or
MediaCompressionFormat depending on the compression type.

We're going to start programming this field for media compression, so
we'd like to use either the bit field name or a new
MediaCompressionFormat field. Either option seems fine, so we go with
the first.

Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14355>

---

 src/intel/genxml/gen125.xml       | 2 +-
 src/intel/isl/isl_surface_state.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/intel/genxml/gen125.xml b/src/intel/genxml/gen125.xml
index edfdc37e04e..0bd955d94bc 100644
--- a/src/intel/genxml/gen125.xml
+++ b/src/intel/genxml/gen125.xml
@@ -863,7 +863,7 @@
     <field name="Clear Value Address Enable" start="330" end="330" type="bool"/>
     <field name="Caching Expanded Formats" start="331" end="331" type="uint"/>
     <field name="Auxiliary Surface Base Address" start="332" end="383" type="address"/>
-    <field name="Render Compression Format" start="384" end="388" type="uint"/>
+    <field name="Compression Format" start="384" end="388" type="uint"/>
     <field name="Clear Value Address" start="390" end="431" type="address"/>
   </struct>
 
diff --git a/src/intel/isl/isl_surface_state.c b/src/intel/isl/isl_surface_state.c
index 78b460d4f86..9ed4cb1fbf1 100644
--- a/src/intel/isl/isl_surface_state.c
+++ b/src/intel/isl/isl_surface_state.c
@@ -552,7 +552,7 @@ isl_genX(surf_fill_state_s)(const struct isl_device *dev, void *state,
       }
 
 #if GFX_VERx10 >= 125
-      s.RenderCompressionFormat =
+      s.CompressionFormat =
          isl_get_render_compression_format(info->surf->format);
 #endif
 #if GFX_VER >= 12