intel: Rename files with gen_ prefix in common code to intel_

Changes in this patch include:
- Rename all files in src/intel/common path
- Update the filenames used in source and build files

Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9413>

src/gallium/drivers/iris/iris_batch.c

@@ -44,8 +44,8 @@
 
 #include "drm-uapi/i915_drm.h"
 
-#include "common/gen_aux_map.h"
-#include "intel/common/gen_gem.h"
+#include "common/intel_aux_map.h"
+#include "intel/common/intel_gem.h"
 #include "util/hash_table.h"
 #include "util/set.h"
 #include "util/u_upload_mgr.h"

src/gallium/drivers/iris/iris_batch.h

@@ -31,7 +31,7 @@
 #include "util/u_dynarray.h"
 
 #include "drm-uapi/i915_drm.h"
-#include "common/gen_decoder.h"
+#include "common/intel_decoder.h"
 
 #include "iris_fence.h"
 #include "iris_fine_fence.h"

src/gallium/drivers/iris/iris_blorp.c

@@ -41,7 +41,7 @@
 #include "iris_context.h"
 
 #include "util/u_upload_mgr.h"
-#include "intel/common/gen_l3_config.h"
+#include "intel/common/intel_l3_config.h"
 
 #include "blorp/blorp_genX_exec.h"
 

src/gallium/drivers/iris/iris_bufmgr.c

@@ -48,10 +48,10 @@
 #include <unistd.h>
 
 #include "errno.h"
-#include "common/gen_aux_map.h"
-#include "common/gen_clflush.h"
+#include "common/intel_aux_map.h"
+#include "common/intel_clflush.h"
 #include "dev/gen_debug.h"
-#include "common/gen_gem.h"
+#include "common/intel_gem.h"
 #include "dev/gen_device_info.h"
 #include "main/macros.h"
 #include "os/os_mman.h"

src/gallium/drivers/iris/iris_context.c

@@ -33,8 +33,8 @@
 #include "iris_context.h"
 #include "iris_resource.h"
 #include "iris_screen.h"
-#include "common/gen_defines.h"
-#include "common/gen_sample_positions.h"
+#include "common/intel_defines.h"
+#include "common/intel_sample_positions.h"
 
 /**
  * For debugging purposes, this returns a time in seconds.

src/gallium/drivers/iris/iris_context.h

@@ -31,7 +31,7 @@
 #include "util/u_threaded_context.h"
 #include "intel/blorp/blorp.h"
 #include "intel/dev/gen_debug.h"
-#include "intel/common/gen_l3_config.h"
+#include "intel/common/intel_l3_config.h"
 #include "intel/compiler/brw_compiler.h"
 #include "iris_batch.h"
 #include "iris_binder.h"

src/gallium/drivers/iris/iris_fence.c

@@ -29,7 +29,7 @@
 #include "drm-uapi/sync_file.h"
 #include "util/u_debug.h"
 #include "util/u_inlines.h"
-#include "intel/common/gen_gem.h"
+#include "intel/common/intel_gem.h"
 
 #include "iris_batch.h"
 #include "iris_bufmgr.h"

src/gallium/drivers/iris/iris_program_cache.c

@@ -38,7 +38,7 @@
 #include "util/u_upload_mgr.h"
 #include "compiler/nir/nir.h"
 #include "compiler/nir/nir_builder.h"
-#include "intel/common/gen_disasm.h"
+#include "intel/common/intel_disasm.h"
 #include "intel/compiler/brw_compiler.h"
 #include "intel/compiler/brw_eu.h"
 #include "intel/compiler/brw_nir.h"

src/gallium/drivers/iris/iris_resource.c

@@ -47,7 +47,7 @@
 #include "iris_context.h"
 #include "iris_resource.h"
 #include "iris_screen.h"
-#include "intel/common/gen_aux_map.h"
+#include "intel/common/intel_aux_map.h"
 #include "intel/dev/gen_debug.h"
 #include "isl/isl.h"
 #include "drm-uapi/drm_fourcc.h"

src/gallium/drivers/iris/iris_screen.c

@@ -53,9 +53,9 @@
 #include "iris_screen.h"
 #include "compiler/glsl_types.h"
 #include "intel/compiler/brw_compiler.h"
-#include "intel/common/gen_gem.h"
-#include "intel/common/gen_l3_config.h"
-#include "intel/common/gen_uuid.h"
+#include "intel/common/intel_gem.h"
+#include "intel/common/intel_l3_config.h"
+#include "intel/common/intel_uuid.h"
 #include "iris_monitor.h"
 
 #define genX_call(devinfo, func, ...)             \

src/gallium/drivers/iris/iris_state.c

@@ -99,9 +99,9 @@
 #include "drm-uapi/i915_drm.h"
 #include "nir.h"
 #include "intel/compiler/brw_compiler.h"
-#include "intel/common/gen_aux_map.h"
-#include "intel/common/gen_l3_config.h"
-#include "intel/common/gen_sample_positions.h"
+#include "intel/common/intel_aux_map.h"
+#include "intel/common/intel_l3_config.h"
+#include "intel/common/intel_sample_positions.h"
 #include "iris_batch.h"
 #include "iris_context.h"
 #include "iris_defines.h"
@@ -109,7 +109,7 @@
 #include "iris_resource.h"
 
 #include "iris_genx_macros.h"
-#include "intel/common/gen_guardband.h"
+#include "intel/common/intel_guardband.h"
 
 /**
  * Statically assert that PIPE_* enums match the hardware packets.

src/intel/Makefile.sources

@@ -8,26 +8,26 @@ BLORP_FILES = \
 	blorp/blorp_priv.h
 
 COMMON_FILES = \
-	common/gen_aux_map.c \
-	common/gen_aux_map.h \
-	common/gen_buffer_alloc.h \
-	common/gen_clflush.h \
-	common/gen_batch_decoder.c \
-	common/gen_decoder.c \
-	common/gen_decoder.h \
-	common/gen_disasm.c \
-	common/gen_disasm.h \
-	common/gen_defines.h \
-	common/gen_gem.c \
-	common/gen_gem.h \
-	common/gen_guardband.h \
-	common/gen_l3_config.c \
-	common/gen_l3_config.h \
-	common/gen_urb_config.c \
-	common/gen_sample_positions.c \
-	common/gen_sample_positions.h \
-	common/gen_uuid.c \
-	common/gen_uuid.h \
+	common/intel_aux_map.c \
+	common/intel_aux_map.h \
+	common/intel_buffer_alloc.h \
+	common/intel_clflush.h \
+	common/intel_batch_decoder.c \
+	common/intel_decoder.c \
+	common/intel_decoder.h \
+	common/intel_disasm.c \
+	common/intel_disasm.h \
+	common/intel_defines.h \
+	common/intel_gem.c \
+	common/intel_gem.h \
+	common/intel_guardband.h \
+	common/intel_l3_config.c \
+	common/intel_l3_config.h \
+	common/intel_urb_config.c \
+	common/intel_sample_positions.c \
+	common/intel_sample_positions.h \
+	common/intel_uuid.c \
+	common/intel_uuid.h \
 	common/intel_measure.c \
 	common/intel_measure.h
 

src/intel/blorp/blorp_genX_exec.h

@@ -26,8 +26,8 @@
 
 #include "blorp_priv.h"
 #include "dev/gen_device_info.h"
-#include "common/gen_sample_positions.h"
-#include "common/gen_l3_config.h"
+#include "common/intel_sample_positions.h"
+#include "common/intel_l3_config.h"
 #include "genxml/gen_macros.h"
 
 /**

src/intel/common/intel_aux_map.c

@@ -74,8 +74,8 @@
  *  - V: entry is valid
  */
 
-#include "gen_aux_map.h"
-#include "gen_gem.h"
+#include "intel_aux_map.h"
+#include "intel_gem.h"
 
 #include "dev/gen_device_info.h"
 #include "isl/isl.h"

src/intel/common/intel_aux_map.h

@@ -21,10 +21,10 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef GEN_AUX_MAP_H
-#define GEN_AUX_MAP_H
+#ifndef INTEL_AUX_MAP_H
+#define INTEL_AUX_MAP_H
 
-#include "gen_buffer_alloc.h"
+#include "intel_buffer_alloc.h"
 
 #include "isl/isl.h"
 
@@ -109,4 +109,4 @@ gen_aux_map_unmap_range(struct gen_aux_map_context *ctx, uint64_t address,
 }
 #endif
 
-#endif /* GEN_AUX_MAP_H */
+#endif /* INTEL_AUX_MAP_H */

src/intel/common/intel_batch_decoder.c

@@ -21,8 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#include "common/gen_decoder.h"
-#include "gen_disasm.h"
+#include "common/intel_decoder.h"
+#include "intel_disasm.h"
 #include "util/macros.h"
 #include "main/macros.h" /* Needed for ROUND_DOWN_TO */
 

src/intel/common/intel_buffer_alloc.h

@@ -21,8 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef GEN_BUFFER_ALLOC_H
-#define GEN_BUFFER_ALLOC_H
+#ifndef INTEL_BUFFER_ALLOC_H
+#define INTEL_BUFFER_ALLOC_H
 
 #include <stdint.h>
 
@@ -46,4 +46,4 @@ struct gen_mapped_pinned_buffer_alloc {
 }
 #endif
 
-#endif /* GEN_BUFFER_ALLOC_H */
+#endif /* INTEL_BUFFER_ALLOC_H */

src/intel/common/intel_clflush.h

@@ -21,8 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef GEN_CLFLUSH_H
-#define GEN_CLFLUSH_H
+#ifndef INTEL_CLFLUSH_H
+#define INTEL_CLFLUSH_H
 
 #define CACHELINE_SIZE 64
 #define CACHELINE_MASK 63

src/intel/common/intel_decoder.c

@@ -33,7 +33,7 @@
 #include <util/macros.h>
 #include <util/ralloc.h>
 
-#include "gen_decoder.h"
+#include "intel_decoder.h"
 
 #include "isl/isl.h"
 #include "genxml/genX_xml.h"

src/intel/common/intel_decoder.h

@@ -21,8 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef GEN_DECODER_H
-#define GEN_DECODER_H
+#ifndef INTEL_DECODER_H
+#define INTEL_DECODER_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -274,4 +274,4 @@ void gen_print_batch(struct gen_batch_decode_ctx *ctx,
 #endif
 
 
-#endif /* GEN_DECODER_H */
+#endif /* INTEL_DECODER_H */

src/intel/common/intel_defines.h

@@ -22,8 +22,8 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef GEN_DEFINES_H
-#define GEN_DEFINES_H
+#ifndef INTEL_DEFINES_H
+#define INTEL_DEFINES_H
 
 #include "drm-uapi/i915_drm.h"
 
@@ -51,4 +51,4 @@ extern "C" {
 }
 #endif
 
-#endif /* GEN_DEFINES_H */
+#endif /* INTEL_DEFINES_H */

src/intel/common/intel_disasm.c

@@ -26,7 +26,7 @@
 #include "compiler/brw_inst.h"
 #include "compiler/brw_eu.h"
 
-#include "gen_disasm.h"
+#include "intel_disasm.h"
 
 static bool
 is_send(uint32_t opcode)

src/intel/common/intel_disasm.h

@@ -21,8 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef GEN_DISASM_H
-#define GEN_DISASM_H
+#ifndef INTEL_DISASM_H
+#define INTEL_DISASM_H
 
 #include "intel/dev/gen_device_info.h"
 
@@ -37,4 +37,4 @@ void gen_disassemble(const struct gen_device_info *devinfo,
 }
 #endif
 
-#endif /* GEN_DISASM_H */
+#endif /* INTEL_DISASM_H */

src/intel/common/intel_gem.c

@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "gen_gem.h"
+#include "intel_gem.h"
 #include "drm-uapi/i915_drm.h"
 
 bool

src/intel/common/intel_gem.h

@@ -21,8 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef GEN_GEM_H
-#define GEN_GEM_H
+#ifndef INTEL_GEM_H
+#define INTEL_GEM_H
 
 #include <errno.h>
 #include <stdbool.h>
@@ -74,4 +74,4 @@ gen_ioctl(int fd, unsigned long request, void *arg)
 
 bool gen_gem_supports_syncobj_wait(int fd);
 
-#endif /* GEN_GEM_H */
+#endif /* INTEL_GEM_H */

src/intel/common/intel_guardband.h

@@ -20,8 +20,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-#ifndef GEN_GUARDBAND_H
-#define GEN_GUARDBAND_H
+#ifndef INTEL_GUARDBAND_H
+#define INTEL_GUARDBAND_H
 
 static inline void
 gen_calculate_guardband_size(uint32_t fb_width, uint32_t fb_height,
@@ -114,4 +114,4 @@ gen_calculate_guardband_size(uint32_t fb_width, uint32_t fb_height,
    }
 }
 
-#endif /* GEN_GUARDBAND_H */
+#endif /* INTEL_GUARDBAND_H */

src/intel/common/intel_l3_config.c

@@ -27,7 +27,7 @@
 #include "util/macros.h"
 #include "main/macros.h"
 
-#include "gen_l3_config.h"
+#include "intel_l3_config.h"
 
 struct gen_l3_list {
    const struct gen_l3_config *configs;

src/intel/common/intel_l3_config.h

@@ -21,8 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef GEN_L3_CONFIG_H
-#define GEN_L3_CONFIG_H
+#ifndef INTEL_L3_CONFIG_H
+#define INTEL_L3_CONFIG_H
 
 #include <stdio.h>
 
@@ -106,4 +106,4 @@ void gen_get_urb_config(const struct gen_device_info *devinfo,
                         enum gen_urb_deref_block_size *deref_block_size,
                         bool *constrained);
 
-#endif /* GEN_L3_CONFIG_H */
+#endif /* INTEL_L3_CONFIG_H */

src/intel/common/intel_sample_positions.c

@@ -21,7 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "gen_sample_positions.h"
+#include "intel_sample_positions.h"
 
 /**
  * 1x MSAA has a single sample at the center: (0.5, 0.5) -> (0x8, 0x8).

src/intel/common/intel_sample_positions.h

@@ -20,8 +20,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-#ifndef GEN_SAMPLE_POSITIONS_H
-#define GEN_SAMPLE_POSITIONS_H
+#ifndef INTEL_SAMPLE_POSITIONS_H
+#define INTEL_SAMPLE_POSITIONS_H
 
 #include <util/macros.h>
 
@@ -126,4 +126,4 @@ prefix##sample_idx##YOffset = arr[sample_idx].y;
 #define GEN_SAMPLE_POS_16X(prefix) \
    GEN_SAMPLE_POS_16X_ARRAY(prefix, gen_sample_positions_16x)
 
-#endif /* GEN_SAMPLE_POSITIONS_H */
+#endif /* INTEL_SAMPLE_POSITIONS_H */

src/intel/common/intel_urb_config.c

@@ -28,7 +28,7 @@
 #include "main/macros.h"
 #include "compiler/shader_enums.h"
 
-#include "gen_l3_config.h"
+#include "intel_l3_config.h"
 
 /**
  * The following diagram shows how we partition the URB:

src/intel/common/intel_uuid.c

@@ -21,7 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "gen_uuid.h"
+#include "intel_uuid.h"
 #include "git_sha1.h"
 #include "util/mesa-sha1.h"
 

src/intel/common/intel_uuid.h

@@ -22,8 +22,8 @@
   *
   */
 
-#ifndef GEN_UUID_H
-#define GEN_UUID_H
+#ifndef INTEL_UUID_H
+#define INTEL_UUID_H
 
 #include "dev/gen_device_info.h"
 #include "isl/isl.h"
@@ -44,4 +44,4 @@ void gen_uuid_compute_driver_id(uint8_t *uuid,
 }
 #endif
 
-#endif /* GEN_UUID_H */
+#endif /* INTEL_UUID_H */

src/intel/common/meson.build

@@ -21,25 +21,25 @@
 # TODO: android?
 
 files_libintel_common = files(
-  'gen_aux_map.c',
-  'gen_aux_map.h',
-  'gen_buffer_alloc.h',
-  'gen_clflush.h',
-  'gen_batch_decoder.c',
-  'gen_decoder.c',
-  'gen_decoder.h',
-  'gen_disasm.c',
-  'gen_disasm.h',
-  'gen_gem.c',
-  'gen_gem.h',
-  'gen_guardband.h',
-  'gen_l3_config.c',
-  'gen_l3_config.h',
-  'gen_urb_config.c',
-  'gen_sample_positions.c',
-  'gen_sample_positions.h',
-  'gen_uuid.c',
-  'gen_uuid.h',
+  'intel_aux_map.c',
+  'intel_aux_map.h',
+  'intel_buffer_alloc.h',
+  'intel_clflush.h',
+  'intel_batch_decoder.c',
+  'intel_decoder.c',
+  'intel_decoder.h',
+  'intel_disasm.c',
+  'intel_disasm.h',
+  'intel_gem.c',
+  'intel_gem.h',
+  'intel_guardband.h',
+  'intel_l3_config.c',
+  'intel_l3_config.h',
+  'intel_urb_config.c',
+  'intel_sample_positions.c',
+  'intel_sample_positions.h',
+  'intel_uuid.c',
+  'intel_uuid.h',
   'intel_measure.c',
   'intel_measure.h',
 )

src/intel/common/tests/genxml_test.c

@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <stdbool.h>
-#include "gen_decoder.h"
+#include "intel_decoder.h"
 
 static bool quiet = false;
 

src/intel/dev/gen_device_info.c

@@ -29,7 +29,7 @@
 #include <unistd.h>
 #include "gen_device_info.h"
 #include "compiler/shader_enums.h"
-#include "intel/common/gen_gem.h"
+#include "intel/common/intel_gem.h"
 #include "util/bitscan.h"
 #include "util/macros.h"
 

src/intel/perf/gen_perf.c

@@ -35,7 +35,7 @@
 
 #include <drm-uapi/i915_drm.h>
 
-#include "common/gen_gem.h"
+#include "common/intel_gem.h"
 
 #include "dev/gen_debug.h"
 #include "dev/gen_device_info.h"

src/intel/perf/gen_perf_query.c

@@ -23,7 +23,7 @@
 
 #include <unistd.h>
 
-#include "common/gen_gem.h"
+#include "common/intel_gem.h"
 
 #include "dev/gen_debug.h"
 #include "dev/gen_device_info.h"

src/intel/tools/aub_mem.h

@@ -31,7 +31,7 @@
 #include "util/rb_tree.h"
 
 #include "dev/gen_device_info.h"
-#include "common/gen_decoder.h"
+#include "common/intel_decoder.h"
 
 #ifdef __cplusplus
 extern "C" {

src/intel/tools/aub_read.c

@@ -27,7 +27,7 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include "common/gen_gem.h"
+#include "common/intel_gem.h"
 #include "util/macros.h"
 
 #include "aub_read.h"

src/intel/tools/aub_write.h

@@ -33,7 +33,7 @@
 #include "drm-uapi/i915_drm.h"
 
 #include "dev/gen_device_info.h"
-#include "common/gen_gem.h"
+#include "common/intel_gem.h"
 
 #ifdef __cplusplus
 extern "C" {

src/intel/tools/aubinator_error_decode.c

@@ -38,7 +38,7 @@
 #include <getopt.h>
 #include <zlib.h>
 
-#include "common/gen_decoder.h"
+#include "common/intel_decoder.h"
 #include "dev/gen_debug.h"
 #include "util/macros.h"
 

src/intel/tools/aubinator_viewer.cpp

@@ -39,7 +39,7 @@
 #include "aub_read.h"
 #include "aub_mem.h"
 
-#include "common/gen_disasm.h"
+#include "common/intel_disasm.h"
 
 #define xtzalloc(name) ((decltype(&name)) calloc(1, sizeof(name)))
 #define xtalloc(name) ((decltype(&name)) malloc(sizeof(name)))

src/intel/tools/aubinator_viewer.h

@@ -3,8 +3,8 @@
 
 #include "imgui/imgui.h"
 
-#include "common/gen_decoder.h"
-#include "common/gen_disasm.h"
+#include "common/intel_decoder.h"
+#include "common/intel_disasm.h"
 
 struct aub_viewer_cfg {
    ImColor clear_color;

src/intel/tools/intel_noop_drm_shim.c

@@ -32,7 +32,7 @@
 #include <sys/resource.h>
 #include <sys/un.h>
 
-#include "common/gen_gem.h"
+#include "common/intel_gem.h"
 #include "dev/gen_device_info.h"
 #include "drm-uapi/i915_drm.h"
 #include "drm-shim/drm_shim.h"

src/intel/tools/intel_sanitize_gpu.c

@@ -43,7 +43,7 @@
 
 #define MESA_LOG_TAG "INTEL-SANITIZE-GPU"
 #include "util/log.h"
-#include "common/gen_clflush.h"
+#include "common/intel_clflush.h"
 
 static int (*libc_open)(const char *pathname, int flags, mode_t mode);
 static int (*libc_close)(int fd);

src/intel/vulkan/anv_allocator.c

@@ -29,7 +29,7 @@
 
 #include "anv_private.h"
 
-#include "common/gen_aux_map.h"
+#include "common/intel_aux_map.h"
 #include "util/anon_file.h"
 
 #ifdef HAVE_VALGRIND

src/intel/vulkan/anv_device.c

@@ -45,9 +45,9 @@
 #include "git_sha1.h"
 #include "vk_util.h"
 #include "vk_deferred_operation.h"
-#include "common/gen_aux_map.h"
-#include "common/gen_defines.h"
-#include "common/gen_uuid.h"
+#include "common/intel_aux_map.h"
+#include "common/intel_defines.h"
+#include "common/intel_uuid.h"
 #include "compiler/glsl_types.h"
 #include "perf/gen_perf.h"
 

src/intel/vulkan/anv_gem.c

@@ -30,8 +30,8 @@
 #include <fcntl.h>
 
 #include "anv_private.h"
-#include "common/gen_defines.h"
-#include "common/gen_gem.h"
+#include "common/intel_defines.h"
+#include "common/intel_gem.h"
 #include "drm-uapi/sync_file.h"
 
 /**

src/intel/vulkan/anv_pipeline.c

@@ -29,9 +29,9 @@
 
 #include "util/mesa-sha1.h"
 #include "util/os_time.h"
-#include "common/gen_l3_config.h"
-#include "common/gen_disasm.h"
-#include "common/gen_sample_positions.h"
+#include "common/intel_l3_config.h"
+#include "common/intel_disasm.h"
+#include "common/intel_sample_positions.h"
 #include "anv_private.h"
 #include "compiler/brw_nir.h"
 #include "anv_nir.h"

src/intel/vulkan/anv_private.h

@@ -43,10 +43,10 @@
 #define VG(x) ((void)0)
 #endif
 
-#include "common/gen_clflush.h"
-#include "common/gen_decoder.h"
-#include "common/gen_gem.h"
-#include "common/gen_l3_config.h"
+#include "common/intel_clflush.h"
+#include "common/intel_decoder.h"
+#include "common/intel_gem.h"
+#include "common/intel_l3_config.h"
 #include "common/intel_measure.h"
 #include "dev/gen_device_info.h"
 #include "blorp/blorp.h"

src/intel/vulkan/gen8_cmd_buffer.c

@@ -31,7 +31,7 @@
 
 #include "genxml/gen_macros.h"
 #include "genxml/genX_pack.h"
-#include "common/gen_guardband.h"
+#include "common/intel_guardband.h"
 
 #if GEN_GEN == 8
 void

src/intel/vulkan/genX_blorp_exec.c

@@ -31,7 +31,7 @@
 #undef __gen_user_data
 #undef __gen_combine_address
 
-#include "common/gen_l3_config.h"
+#include "common/intel_l3_config.h"
 #include "blorp/blorp_genX_exec.h"
 
 static void blorp_measure_start(struct blorp_batch *_batch,

src/intel/vulkan/genX_cmd_buffer.c

@@ -30,8 +30,8 @@
 #include "vk_util.h"
 #include "util/fast_idiv_by_const.h"
 
-#include "common/gen_aux_map.h"
-#include "common/gen_l3_config.h"
+#include "common/intel_aux_map.h"
+#include "common/intel_l3_config.h"
 #include "genxml/gen_macros.h"
 #include "genxml/genX_pack.h"
 

src/intel/vulkan/genX_gpu_memcpy.c

@@ -26,7 +26,7 @@
 #include "genxml/gen_macros.h"
 #include "genxml/genX_pack.h"
 
-#include "common/gen_l3_config.h"
+#include "common/intel_l3_config.h"
 
 /**
  * This file implements some lightweight memcpy/memset operations on the GPU

src/intel/vulkan/genX_pipeline.c

@@ -26,8 +26,8 @@
 #include "genxml/gen_macros.h"
 #include "genxml/genX_pack.h"
 
-#include "common/gen_l3_config.h"
-#include "common/gen_sample_positions.h"
+#include "common/intel_l3_config.h"
+#include "common/intel_sample_positions.h"
 #include "nir/nir_xfb_info.h"
 #include "vk_util.h"
 #include "vk_format.h"

src/intel/vulkan/genX_state.c

@@ -29,8 +29,8 @@
 
 #include "anv_private.h"
 
-#include "common/gen_aux_map.h"
-#include "common/gen_sample_positions.h"
+#include "common/intel_aux_map.h"
+#include "common/intel_sample_positions.h"
 #include "genxml/gen_macros.h"
 #include "genxml/genX_pack.h"
 

src/mesa/drivers/dri/i965/brw_bufmgr.c

@@ -45,9 +45,9 @@
 #include <stdbool.h>
 
 #include "errno.h"
-#include "common/gen_clflush.h"
+#include "common/intel_clflush.h"
 #include "dev/gen_debug.h"
-#include "common/gen_gem.h"
+#include "common/intel_gem.h"
 #include "dev/gen_device_info.h"
 #include "libdrm_macros.h"
 #include "main/macros.h"

src/mesa/drivers/dri/i965/brw_context.c

@@ -78,7 +78,7 @@
 #include "util/u_memory.h"
 #include "isl/isl.h"
 
-#include "common/gen_defines.h"
+#include "common/intel_defines.h"
 
 #include "compiler/spirv/nir_spirv.h"
 /***************************************

src/mesa/drivers/dri/i965/brw_context.h

@@ -47,7 +47,7 @@
 #include <brw_bufmgr.h>
 
 #include "dev/gen_debug.h"
-#include "common/gen_decoder.h"
+#include "common/intel_decoder.h"
 #include "intel_screen.h"
 #include "intel_tex_obj.h"
 #include "perf/gen_perf.h"

src/mesa/drivers/dri/i965/gen7_l3_state.c

@@ -21,7 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "common/gen_l3_config.h"
+#include "common/intel_l3_config.h"
 
 #include "brw_context.h"
 #include "brw_defines.h"

src/mesa/drivers/dri/i965/gen7_urb.c

@@ -27,7 +27,7 @@
 #include "brw_state.h"
 #include "brw_defines.h"
 
-#include "common/gen_l3_config.h"
+#include "common/intel_l3_config.h"
 
 /**
  * The following diagram shows how we partition the URB:

src/mesa/drivers/dri/i965/genX_state_upload.c

@@ -26,9 +26,9 @@
 #include "main/samplerobj.h"
 
 #include "dev/gen_device_info.h"
-#include "common/gen_sample_positions.h"
+#include "common/intel_sample_positions.h"
 #include "genxml/gen_macros.h"
-#include "common/gen_guardband.h"
+#include "common/intel_guardband.h"
 
 #include "main/bufferobj.h"
 #include "main/context.h"

src/mesa/drivers/dri/i965/intel_batchbuffer.c

@@ -31,8 +31,8 @@
 #include "brw_context.h"
 #include "brw_defines.h"
 #include "brw_state.h"
-#include "common/gen_decoder.h"
-#include "common/gen_gem.h"
+#include "common/intel_decoder.h"
+#include "common/intel_gem.h"
 
 #include "util/hash_table.h"
 

src/mesa/drivers/dri/i965/intel_screen.c

@@ -48,7 +48,7 @@
 #include "util/u_cpu_detect.h"
 #include "util/u_memory.h"
 
-#include "common/gen_defines.h"
+#include "common/intel_defines.h"
 
 static const driOptionDescription brw_driconf[] = {
    DRI_CONF_SECTION_PERFORMANCE