X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fintel%2Fisl%2Fisl_gen6.h;h=c954026efb6468f63aded16859db3009f69426b2;hb=e8b3bc1d5530f3979b2a5053bba026c4804147e8;hp=0779c67494014a3ee328ea72cad37968b9ccb4a2;hpb=12f88ba32a14ea79134f4e995a55149f078a2f27;p=mesa.git

diff --git a/src/intel/isl/isl_gen6.h b/src/intel/isl/isl_gen6.h
index 0779c674940..c954026efb6 100644
--- a/src/intel/isl/isl_gen6.h
+++ b/src/intel/isl/isl_gen6.h
@@ -21,27 +21,31 @@
  *  IN THE SOFTWARE.
  */
 
-#pragma once
+#ifndef ISL_GEN6_H
+#define ISL_GEN6_H
 
-#include "isl_priv.h"
+#include "isl.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 bool
-gen6_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_gen6_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
-gen6_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_gen6_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_GEN6_H */