freedreno/layout: layout simplifications and pitch from level 0 pitch

[mesa.git] / src / freedreno / fdl / fd_layout_test.c

diff --git a/src/freedreno/fdl/fd_layout_test.c b/src/freedreno/fdl/fd_layout_test.c
index 99d17e52cc62f0b0fe9cd8c23d058591fca06ffc..08e8c1b2509bab606482a8662a682ec0ea2ca1ba 100644 (file)
--- a/src/freedreno/fdl/fd_layout_test.c
+++ b/src/freedreno/fdl/fd_layout_test.c
@@ -89,12 +89,12 @@ bool fdl_test_layout(const struct testcase *testcase, int gpu_id)
                                        testcase->layout.slices[l].offset);
                        ok = false;
                }
-               if (layout.slices[l].pitch != testcase->layout.slices[l].pitch) {
+               if (fdl_pitch(&layout, l) != testcase->layout.slices[l].pitch) {
                        fprintf(stderr, "%s %dx%dx%d@%dx lvl%d: pitch %d != %d\n",
                                        util_format_short_name(testcase->format),
                                        layout.width0, layout.height0, layout.depth0,
                                        layout.nr_samples, l,
-                                       layout.slices[l].pitch,
+                                       fdl_pitch(&layout, l),
                                        testcase->layout.slices[l].pitch);
                        ok = false;
                }
@@ -108,12 +108,12 @@ bool fdl_test_layout(const struct testcase *testcase, int gpu_id)
                                        testcase->layout.ubwc_slices[l].offset);
                        ok = false;
                }
-               if (layout.ubwc_slices[l].pitch != testcase->layout.ubwc_slices[l].pitch) {
+               if (fdl_ubwc_pitch(&layout, l) != testcase->layout.ubwc_slices[l].pitch) {
                        fprintf(stderr, "%s %dx%dx%d@%dx lvl%d: UBWC pitch %d != %d\n",
                                        util_format_short_name(testcase->format),
                                        layout.width0, layout.height0, layout.depth0,
                                        layout.nr_samples, l,
-                                       layout.ubwc_slices[l].pitch,
+                                       fdl_ubwc_pitch(&layout, l),
                                        testcase->layout.ubwc_slices[l].pitch);
                        ok = false;
                }