X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fintel%2Fisl%2Fisl_gen7.h;h=f1b7252ba3ea807e88fd4bf45b99a59a938dd121;hb=7e7959fcb76da59e1cec8b704069210a1092e1dd;hp=2a95b68a9bd0d901186455821338febfc782c511;hpb=47b8b08612d44a43e43c3f6e95fe509ee3348723;p=mesa.git

diff --git a/src/intel/isl/isl_gen7.h b/src/intel/isl/isl_gen7.h
index 2a95b68a9bd..f1b7252ba3e 100644
--- a/src/intel/isl/isl_gen7.h
+++ b/src/intel/isl/isl_gen7.h
@@ -21,32 +21,36 @@
  *  IN THE SOFTWARE.
  */
 
-#pragma once
+#ifndef ISL_GEN7_H
+#define ISL_GEN7_H
 
-#include "isl_priv.h"
+#include "isl.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 void
-gen7_filter_tiling(const struct isl_device *dev,
-                   const struct isl_surf_init_info *restrict info,
-                   isl_tiling_flags_t *flags);
+isl_gen6_filter_tiling(const struct isl_device *dev,
+                       const struct isl_surf_init_info *restrict info,
+                       isl_tiling_flags_t *flags);
 
 bool
-gen7_choose_msaa_layout(const struct isl_device *dev,
-                        const struct isl_surf_init_info *info,
-                        enum isl_tiling tiling,
-                        enum isl_msaa_layout *msaa_layout);
+isl_gen7_choose_msaa_layout(const struct isl_device *dev,
+                            const struct isl_surf_init_info *info,
+                            enum isl_tiling tiling,
+                            enum isl_msaa_layout *msaa_layout);
 
 void
-gen7_choose_image_alignment_el(const struct isl_device *dev,
-                               const struct isl_surf_init_info *restrict info,
-                               enum isl_tiling tiling,
-                               enum isl_msaa_layout msaa_layout,
-                               struct isl_extent3d *image_align_el);
+isl_gen7_choose_image_alignment_el(const struct isl_device *dev,
+                                   const struct isl_surf_init_info *restrict info,
+                                   enum isl_tiling tiling,
+                                   enum isl_dim_layout dim_layout,
+                                   enum isl_msaa_layout msaa_layout,
+                                   struct isl_extent3d *image_align_el);
 
 #ifdef __cplusplus
 }
 #endif
+
+#endif /* ISL_GEN7_H */