Mesa (master): intel: Rename files with gen_ prefix in common code to intel_
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Mar 10 22:30:57 UTC 2021
Module: Mesa
Branch: master
Commit: 733b0ee8cb750bd54e17891f0b26323dc088f325
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=733b0ee8cb750bd54e17891f0b26323dc088f325
Author: Anuj Phogat <anuj.phogat at gmail.com>
Date: Wed Mar 3 13:20:06 2021 -0800
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 at gmail.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9413>
---
src/gallium/drivers/iris/iris_batch.c | 4 +--
src/gallium/drivers/iris/iris_batch.h | 2 +-
src/gallium/drivers/iris/iris_blorp.c | 2 +-
src/gallium/drivers/iris/iris_bufmgr.c | 6 ++--
src/gallium/drivers/iris/iris_context.c | 4 +--
src/gallium/drivers/iris/iris_context.h | 2 +-
src/gallium/drivers/iris/iris_fence.c | 2 +-
src/gallium/drivers/iris/iris_program_cache.c | 2 +-
src/gallium/drivers/iris/iris_resource.c | 2 +-
src/gallium/drivers/iris/iris_screen.c | 6 ++--
src/gallium/drivers/iris/iris_state.c | 8 ++---
src/intel/Makefile.sources | 40 +++++++++++-----------
src/intel/blorp/blorp_genX_exec.h | 4 +--
.../common/{gen_aux_map.c => intel_aux_map.c} | 4 +--
.../common/{gen_aux_map.h => intel_aux_map.h} | 8 ++---
.../{gen_batch_decoder.c => intel_batch_decoder.c} | 4 +--
.../{gen_buffer_alloc.h => intel_buffer_alloc.h} | 6 ++--
.../common/{gen_clflush.h => intel_clflush.h} | 4 +--
.../common/{gen_decoder.c => intel_decoder.c} | 2 +-
.../common/{gen_decoder.h => intel_decoder.h} | 6 ++--
.../common/{gen_defines.h => intel_defines.h} | 6 ++--
src/intel/common/{gen_disasm.c => intel_disasm.c} | 2 +-
src/intel/common/{gen_disasm.h => intel_disasm.h} | 6 ++--
src/intel/common/{gen_gem.c => intel_gem.c} | 2 +-
src/intel/common/{gen_gem.h => intel_gem.h} | 6 ++--
.../common/{gen_guardband.h => intel_guardband.h} | 6 ++--
.../common/{gen_l3_config.c => intel_l3_config.c} | 2 +-
.../common/{gen_l3_config.h => intel_l3_config.h} | 6 ++--
...sample_positions.c => intel_sample_positions.c} | 2 +-
...sample_positions.h => intel_sample_positions.h} | 6 ++--
.../{gen_urb_config.c => intel_urb_config.c} | 2 +-
src/intel/common/{gen_uuid.c => intel_uuid.c} | 2 +-
src/intel/common/{gen_uuid.h => intel_uuid.h} | 6 ++--
src/intel/common/meson.build | 38 ++++++++++----------
src/intel/common/tests/genxml_test.c | 2 +-
src/intel/dev/gen_device_info.c | 2 +-
src/intel/perf/gen_perf.c | 2 +-
src/intel/perf/gen_perf_query.c | 2 +-
src/intel/tools/aub_mem.h | 2 +-
src/intel/tools/aub_read.c | 2 +-
src/intel/tools/aub_write.h | 2 +-
src/intel/tools/aubinator_error_decode.c | 2 +-
src/intel/tools/aubinator_viewer.cpp | 2 +-
src/intel/tools/aubinator_viewer.h | 4 +--
src/intel/tools/intel_noop_drm_shim.c | 2 +-
src/intel/tools/intel_sanitize_gpu.c | 2 +-
src/intel/vulkan/anv_allocator.c | 2 +-
src/intel/vulkan/anv_device.c | 6 ++--
src/intel/vulkan/anv_gem.c | 4 +--
src/intel/vulkan/anv_pipeline.c | 6 ++--
src/intel/vulkan/anv_private.h | 8 ++---
src/intel/vulkan/gen8_cmd_buffer.c | 2 +-
src/intel/vulkan/genX_blorp_exec.c | 2 +-
src/intel/vulkan/genX_cmd_buffer.c | 4 +--
src/intel/vulkan/genX_gpu_memcpy.c | 2 +-
src/intel/vulkan/genX_pipeline.c | 4 +--
src/intel/vulkan/genX_state.c | 4 +--
src/mesa/drivers/dri/i965/brw_bufmgr.c | 4 +--
src/mesa/drivers/dri/i965/brw_context.c | 2 +-
src/mesa/drivers/dri/i965/brw_context.h | 2 +-
src/mesa/drivers/dri/i965/gen7_l3_state.c | 2 +-
src/mesa/drivers/dri/i965/gen7_urb.c | 2 +-
src/mesa/drivers/dri/i965/genX_state_upload.c | 4 +--
src/mesa/drivers/dri/i965/intel_batchbuffer.c | 4 +--
src/mesa/drivers/dri/i965/intel_screen.c | 2 +-
65 files changed, 151 insertions(+), 151 deletions(-)
diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c
index 5e201116601..82bb452b9f5 100644
--- a/src/gallium/drivers/iris/iris_batch.c
+++ b/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"
diff --git a/src/gallium/drivers/iris/iris_batch.h b/src/gallium/drivers/iris/iris_batch.h
index 51c407e1fe2..a5c91813075 100644
--- a/src/gallium/drivers/iris/iris_batch.h
+++ b/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"
diff --git a/src/gallium/drivers/iris/iris_blorp.c b/src/gallium/drivers/iris/iris_blorp.c
index 0dee4adf14c..119f2bc4a09 100644
--- a/src/gallium/drivers/iris/iris_blorp.c
+++ b/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"
diff --git a/src/gallium/drivers/iris/iris_bufmgr.c b/src/gallium/drivers/iris/iris_bufmgr.c
index 9a67602ac02..c643d259490 100644
--- a/src/gallium/drivers/iris/iris_bufmgr.c
+++ b/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"
diff --git a/src/gallium/drivers/iris/iris_context.c b/src/gallium/drivers/iris/iris_context.c
index 1be0e4414a7..a17942859d9 100644
--- a/src/gallium/drivers/iris/iris_context.c
+++ b/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.
diff --git a/src/gallium/drivers/iris/iris_context.h b/src/gallium/drivers/iris/iris_context.h
index 0b5cef1d452..b01996600f1 100644
--- a/src/gallium/drivers/iris/iris_context.h
+++ b/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"
diff --git a/src/gallium/drivers/iris/iris_fence.c b/src/gallium/drivers/iris/iris_fence.c
index b839e0c958e..132c25beb34 100644
--- a/src/gallium/drivers/iris/iris_fence.c
+++ b/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"
diff --git a/src/gallium/drivers/iris/iris_program_cache.c b/src/gallium/drivers/iris/iris_program_cache.c
index e3673c22f83..e985ac56134 100644
--- a/src/gallium/drivers/iris/iris_program_cache.c
+++ b/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"
diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c
index 2495883e876..228690273c6 100644
--- a/src/gallium/drivers/iris/iris_resource.c
+++ b/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"
diff --git a/src/gallium/drivers/iris/iris_screen.c b/src/gallium/drivers/iris/iris_screen.c
index aa737e6a478..a76af01c9cf 100644
--- a/src/gallium/drivers/iris/iris_screen.c
+++ b/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, ...) \
diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 376cd5a43a8..b91316a20dc 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/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.
diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources
index 4af8231227c..450a5ccc43f 100644
--- a/src/intel/Makefile.sources
+++ b/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
diff --git a/src/intel/blorp/blorp_genX_exec.h b/src/intel/blorp/blorp_genX_exec.h
index d2ef3ab9754..eb166b289f1 100644
--- a/src/intel/blorp/blorp_genX_exec.h
+++ b/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"
/**
diff --git a/src/intel/common/gen_aux_map.c b/src/intel/common/intel_aux_map.c
similarity index 99%
rename from src/intel/common/gen_aux_map.c
rename to src/intel/common/intel_aux_map.c
index 23f4ba9dc2b..59aa4d4268d 100644
--- a/src/intel/common/gen_aux_map.c
+++ b/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"
diff --git a/src/intel/common/gen_aux_map.h b/src/intel/common/intel_aux_map.h
similarity index 97%
rename from src/intel/common/gen_aux_map.h
rename to src/intel/common/intel_aux_map.h
index 36bd6382e07..31a870e1e3e 100644
--- a/src/intel/common/gen_aux_map.h
+++ b/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 */
diff --git a/src/intel/common/gen_batch_decoder.c b/src/intel/common/intel_batch_decoder.c
similarity index 99%
rename from src/intel/common/gen_batch_decoder.c
rename to src/intel/common/intel_batch_decoder.c
index 6efadbfea2d..11002b2d5c2 100644
--- a/src/intel/common/gen_batch_decoder.c
+++ b/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 */
diff --git a/src/intel/common/gen_buffer_alloc.h b/src/intel/common/intel_buffer_alloc.h
similarity index 94%
rename from src/intel/common/gen_buffer_alloc.h
rename to src/intel/common/intel_buffer_alloc.h
index eafb9755c1c..d5635bf7eb6 100644
--- a/src/intel/common/gen_buffer_alloc.h
+++ b/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 */
diff --git a/src/intel/common/gen_clflush.h b/src/intel/common/intel_clflush.h
similarity index 97%
rename from src/intel/common/gen_clflush.h
rename to src/intel/common/intel_clflush.h
index d39f15807eb..01550699163 100644
--- a/src/intel/common/gen_clflush.h
+++ b/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
diff --git a/src/intel/common/gen_decoder.c b/src/intel/common/intel_decoder.c
similarity index 99%
rename from src/intel/common/gen_decoder.c
rename to src/intel/common/intel_decoder.c
index d07962a0b97..7a5dff33790 100644
--- a/src/intel/common/gen_decoder.c
+++ b/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"
diff --git a/src/intel/common/gen_decoder.h b/src/intel/common/intel_decoder.h
similarity index 99%
rename from src/intel/common/gen_decoder.h
rename to src/intel/common/intel_decoder.h
index 5a7409182ce..22878df0e04 100644
--- a/src/intel/common/gen_decoder.h
+++ b/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 */
diff --git a/src/intel/common/gen_defines.h b/src/intel/common/intel_defines.h
similarity index 96%
rename from src/intel/common/gen_defines.h
rename to src/intel/common/intel_defines.h
index 2f8715821cf..5a870ce3167 100644
--- a/src/intel/common/gen_defines.h
+++ b/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 */
diff --git a/src/intel/common/gen_disasm.c b/src/intel/common/intel_disasm.c
similarity index 99%
rename from src/intel/common/gen_disasm.c
rename to src/intel/common/intel_disasm.c
index 5ec9d371663..efaceaec3d8 100644
--- a/src/intel/common/gen_disasm.c
+++ b/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)
diff --git a/src/intel/common/gen_disasm.h b/src/intel/common/intel_disasm.h
similarity index 94%
rename from src/intel/common/gen_disasm.h
rename to src/intel/common/intel_disasm.h
index 9e6c75846bc..26ece273b40 100644
--- a/src/intel/common/gen_disasm.h
+++ b/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 */
diff --git a/src/intel/common/gen_gem.c b/src/intel/common/intel_gem.c
similarity index 98%
rename from src/intel/common/gen_gem.c
rename to src/intel/common/intel_gem.c
index e485a5617d8..a827760696c 100644
--- a/src/intel/common/gen_gem.c
+++ b/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
diff --git a/src/intel/common/gen_gem.h b/src/intel/common/intel_gem.h
similarity index 97%
rename from src/intel/common/gen_gem.h
rename to src/intel/common/intel_gem.h
index cfcc59c2069..529fe288960 100644
--- a/src/intel/common/gen_gem.h
+++ b/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 */
diff --git a/src/intel/common/gen_guardband.h b/src/intel/common/intel_guardband.h
similarity index 98%
rename from src/intel/common/gen_guardband.h
rename to src/intel/common/intel_guardband.h
index 757324fd2ee..60e75249fea 100644
--- a/src/intel/common/gen_guardband.h
+++ b/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 */
diff --git a/src/intel/common/gen_l3_config.c b/src/intel/common/intel_l3_config.c
similarity index 99%
rename from src/intel/common/gen_l3_config.c
rename to src/intel/common/intel_l3_config.c
index db351712ab0..25b0148fcd2 100644
--- a/src/intel/common/gen_l3_config.c
+++ b/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;
diff --git a/src/intel/common/gen_l3_config.h b/src/intel/common/intel_l3_config.h
similarity index 97%
rename from src/intel/common/gen_l3_config.h
rename to src/intel/common/intel_l3_config.h
index 352ba569c46..e68631d6f07 100644
--- a/src/intel/common/gen_l3_config.h
+++ b/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 */
diff --git a/src/intel/common/gen_sample_positions.c b/src/intel/common/intel_sample_positions.c
similarity index 98%
rename from src/intel/common/gen_sample_positions.c
rename to src/intel/common/intel_sample_positions.c
index 043c8db978a..bf1b1e70816 100644
--- a/src/intel/common/gen_sample_positions.c
+++ b/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).
diff --git a/src/intel/common/gen_sample_positions.h b/src/intel/common/intel_sample_positions.h
similarity index 97%
rename from src/intel/common/gen_sample_positions.h
rename to src/intel/common/intel_sample_positions.h
index ea7f4f818c8..03ffc5b086b 100644
--- a/src/intel/common/gen_sample_positions.h
+++ b/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 */
diff --git a/src/intel/common/gen_urb_config.c b/src/intel/common/intel_urb_config.c
similarity index 99%
rename from src/intel/common/gen_urb_config.c
rename to src/intel/common/intel_urb_config.c
index c84b5afb2d7..47f1793a999 100644
--- a/src/intel/common/gen_urb_config.c
+++ b/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:
diff --git a/src/intel/common/gen_uuid.c b/src/intel/common/intel_uuid.c
similarity index 99%
rename from src/intel/common/gen_uuid.c
rename to src/intel/common/intel_uuid.c
index 921c43d4a17..ac06f6d1527 100644
--- a/src/intel/common/gen_uuid.c
+++ b/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"
diff --git a/src/intel/common/gen_uuid.h b/src/intel/common/intel_uuid.h
similarity index 96%
rename from src/intel/common/gen_uuid.h
rename to src/intel/common/intel_uuid.h
index 507e10b6b7e..711868ab1a9 100644
--- a/src/intel/common/gen_uuid.h
+++ b/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 */
diff --git a/src/intel/common/meson.build b/src/intel/common/meson.build
index e28e0ddfa83..503431a32cc 100644
--- a/src/intel/common/meson.build
+++ b/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',
)
diff --git a/src/intel/common/tests/genxml_test.c b/src/intel/common/tests/genxml_test.c
index 49a038d3b2a..115274c91ce 100644
--- a/src/intel/common/tests/genxml_test.c
+++ b/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;
diff --git a/src/intel/dev/gen_device_info.c b/src/intel/dev/gen_device_info.c
index 7210f56ef94..626b1753319 100644
--- a/src/intel/dev/gen_device_info.c
+++ b/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"
diff --git a/src/intel/perf/gen_perf.c b/src/intel/perf/gen_perf.c
index 795aa88bf89..fc40e4490f6 100644
--- a/src/intel/perf/gen_perf.c
+++ b/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"
diff --git a/src/intel/perf/gen_perf_query.c b/src/intel/perf/gen_perf_query.c
index c32ff2df043..46535c09120 100644
--- a/src/intel/perf/gen_perf_query.c
+++ b/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"
diff --git a/src/intel/tools/aub_mem.h b/src/intel/tools/aub_mem.h
index 1d73d3340f2..c253da8e4dc 100644
--- a/src/intel/tools/aub_mem.h
+++ b/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" {
diff --git a/src/intel/tools/aub_read.c b/src/intel/tools/aub_read.c
index 90ee03abd93..1d6a893ec60 100644
--- a/src/intel/tools/aub_read.c
+++ b/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"
diff --git a/src/intel/tools/aub_write.h b/src/intel/tools/aub_write.h
index 24eb69f6375..79f584de26a 100644
--- a/src/intel/tools/aub_write.h
+++ b/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" {
diff --git a/src/intel/tools/aubinator_error_decode.c b/src/intel/tools/aubinator_error_decode.c
index 680bfb88f88..cd2a31a9c5c 100644
--- a/src/intel/tools/aubinator_error_decode.c
+++ b/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"
diff --git a/src/intel/tools/aubinator_viewer.cpp b/src/intel/tools/aubinator_viewer.cpp
index 1b7f5a99d14..d38a347179f 100644
--- a/src/intel/tools/aubinator_viewer.cpp
+++ b/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)))
diff --git a/src/intel/tools/aubinator_viewer.h b/src/intel/tools/aubinator_viewer.h
index 705c85e79ee..749018a5450 100644
--- a/src/intel/tools/aubinator_viewer.h
+++ b/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;
diff --git a/src/intel/tools/intel_noop_drm_shim.c b/src/intel/tools/intel_noop_drm_shim.c
index aee48839f77..da1a23efd1d 100644
--- a/src/intel/tools/intel_noop_drm_shim.c
+++ b/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"
diff --git a/src/intel/tools/intel_sanitize_gpu.c b/src/intel/tools/intel_sanitize_gpu.c
index 23f531a88b9..bda540d6d75 100644
--- a/src/intel/tools/intel_sanitize_gpu.c
+++ b/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);
diff --git a/src/intel/vulkan/anv_allocator.c b/src/intel/vulkan/anv_allocator.c
index 95e3fc3a2c0..23094c31727 100644
--- a/src/intel/vulkan/anv_allocator.c
+++ b/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
diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index 0d1249b76b4..48cb201cc91 100644
--- a/src/intel/vulkan/anv_device.c
+++ b/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"
diff --git a/src/intel/vulkan/anv_gem.c b/src/intel/vulkan/anv_gem.c
index e6a6cc1cbc5..0c514a742fb 100644
--- a/src/intel/vulkan/anv_gem.c
+++ b/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"
/**
diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c
index cfa95e02153..7563048ade3 100644
--- a/src/intel/vulkan/anv_pipeline.c
+++ b/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"
diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index ae19392ff65..86a61af23f0 100644
--- a/src/intel/vulkan/anv_private.h
+++ b/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"
diff --git a/src/intel/vulkan/gen8_cmd_buffer.c b/src/intel/vulkan/gen8_cmd_buffer.c
index 9cd85f80d3a..e955fc6dc73 100644
--- a/src/intel/vulkan/gen8_cmd_buffer.c
+++ b/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
diff --git a/src/intel/vulkan/genX_blorp_exec.c b/src/intel/vulkan/genX_blorp_exec.c
index 7fa2361e437..ebcd9b08629 100644
--- a/src/intel/vulkan/genX_blorp_exec.c
+++ b/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,
diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c
index f292cb9a28b..19b6d36c84d 100644
--- a/src/intel/vulkan/genX_cmd_buffer.c
+++ b/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"
diff --git a/src/intel/vulkan/genX_gpu_memcpy.c b/src/intel/vulkan/genX_gpu_memcpy.c
index 68004c54c83..d5cc6cfe1f9 100644
--- a/src/intel/vulkan/genX_gpu_memcpy.c
+++ b/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
diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c
index 40b21c17610..4336fba2edb 100644
--- a/src/intel/vulkan/genX_pipeline.c
+++ b/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"
diff --git a/src/intel/vulkan/genX_state.c b/src/intel/vulkan/genX_state.c
index 20dde23f14f..83f67d5e90e 100644
--- a/src/intel/vulkan/genX_state.c
+++ b/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"
diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.c b/src/mesa/drivers/dri/i965/brw_bufmgr.c
index 74d0909c52a..82b794401cb 100644
--- a/src/mesa/drivers/dri/i965/brw_bufmgr.c
+++ b/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"
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index 57ac453f3b4..33cfcfafde3 100644
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/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"
/***************************************
diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h
index 9371527b623..54a0ad9ec85 100644
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/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"
diff --git a/src/mesa/drivers/dri/i965/gen7_l3_state.c b/src/mesa/drivers/dri/i965/gen7_l3_state.c
index bfbe3ae8783..55430de9af7 100644
--- a/src/mesa/drivers/dri/i965/gen7_l3_state.c
+++ b/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"
diff --git a/src/mesa/drivers/dri/i965/gen7_urb.c b/src/mesa/drivers/dri/i965/gen7_urb.c
index 6898728dbc5..c2f826c3318 100644
--- a/src/mesa/drivers/dri/i965/gen7_urb.c
+++ b/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:
diff --git a/src/mesa/drivers/dri/i965/genX_state_upload.c b/src/mesa/drivers/dri/i965/genX_state_upload.c
index 3f34391f3a7..9156c51242d 100644
--- a/src/mesa/drivers/dri/i965/genX_state_upload.c
+++ b/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"
diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.c b/src/mesa/drivers/dri/i965/intel_batchbuffer.c
index ecf81f286b1..5edafa7b667 100644
--- a/src/mesa/drivers/dri/i965/intel_batchbuffer.c
+++ b/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"
diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index 72e4f21ffbf..fee6ac3afc7 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/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
More information about the mesa-commit
mailing list