intel: s/brw_device_info/gen_device_info/

Generated by:

sed -i -e 's/brw_device_info/gen_device_info/g' src/intel/**/*.c
sed -i -e 's/brw_device_info/gen_device_info/g' src/intel/**/*.h
sed -i -e 's/brw_device_info/gen_device_info/g' **/i965/*.c
sed -i -e 's/brw_device_info/gen_device_info/g' **/i965/*.cpp
sed -i -e 's/brw_device_info/gen_device_info/g' **/i965/*.h

Signed-off-by: Jason Ekstrand <[email protected]>
Reviewed-by: Jordan Justen <[email protected]>

7 files changed, 28 insertions, 28 deletions

diff --git a/src/intel/vulkan/anv_allocator.c b/src/intel/vulkan/anv_allocator.c
index f268e721fa8..457a88ff0cd 100644
--- a/src/intel/vulkan/anv_allocator.c
+++ b/src/intel/vulkan/anv_allocator.c
@@ -922,7 +922,7 @@ anv_scratch_pool_alloc(struct anv_device *device, struct anv_scratch_pool *pool,
    if (size == 0) {
       /* We own the lock.  Allocate a buffer */
 
-      struct brw_device_info *devinfo = &device->info;
+      struct gen_device_info *devinfo = &device->info;
       uint32_t max_threads[] = {
          [MESA_SHADER_VERTEX]                  = devinfo->max_vs_threads,
          [MESA_SHADER_TESS_CTRL]               = devinfo->max_hs_threads,
diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index cf6399364c5..08dfa18defe 100644
--- a/src/intel/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
@@ -438,7 +438,7 @@ void anv_GetPhysicalDeviceProperties(
     VkPhysicalDeviceProperties*                 pProperties)
 {
    ANV_FROM_HANDLE(anv_physical_device, pdevice, physicalDevice);
-   const struct brw_device_info *devinfo = pdevice->info;
+   const struct gen_device_info *devinfo = pdevice->info;
 
    const float time_stamp_base = devinfo->gen >= 9 ? 83.333 : 80.0;
 
diff --git a/src/intel/vulkan/anv_entrypoints_gen.py b/src/intel/vulkan/anv_entrypoints_gen.py
index dcf25ee76c6..b0264950d62 100644
--- a/src/intel/vulkan/anv_entrypoints_gen.py
+++ b/src/intel/vulkan/anv_entrypoints_gen.py
@@ -125,7 +125,7 @@ if opt_header:
     print "   };\n"
     print "};\n"
 
-    print "void anv_set_dispatch_devinfo(const struct brw_device_info *info);\n"
+    print "void anv_set_dispatch_devinfo(const struct gen_device_info *info);\n"
 
     for type, name, args, num, h in entrypoints:
         print_guard_start(name)
@@ -214,10 +214,10 @@ for layer in [ "anv", "gen7", "gen75", "gen8", "gen9" ]:
     print "};\n"
 
 print """
-static const struct brw_device_info *dispatch_devinfo;
+static const struct gen_device_info *dispatch_devinfo;
 
 void
-anv_set_dispatch_devinfo(const struct brw_device_info *devinfo)
+anv_set_dispatch_devinfo(const struct gen_device_info *devinfo)
 {
    dispatch_devinfo = devinfo;
 }
diff --git a/src/intel/vulkan/anv_formats.c b/src/intel/vulkan/anv_formats.c
index bbfb2925d77..a746cd3545b 100644
--- a/src/intel/vulkan/anv_formats.c
+++ b/src/intel/vulkan/anv_formats.c
@@ -245,7 +245,7 @@ static const struct anv_format anv_formats[] = {
  * Exactly one bit must be set in \a aspect.
  */
 struct anv_format
-anv_get_format(const struct brw_device_info *devinfo, VkFormat vk_format,
+anv_get_format(const struct gen_device_info *devinfo, VkFormat vk_format,
                VkImageAspectFlags aspect, VkImageTiling tiling)
 {
    struct anv_format format = anv_formats[vk_format];
@@ -303,7 +303,7 @@ anv_get_format(const struct brw_device_info *devinfo, VkFormat vk_format,
 // Format capabilities
 
 static VkFormatFeatureFlags
-get_image_format_properties(const struct brw_device_info *devinfo,
+get_image_format_properties(const struct gen_device_info *devinfo,
                             enum isl_format base, struct anv_format format)
 {
    if (format.isl_format == ISL_FORMAT_UNSUPPORTED)
@@ -344,7 +344,7 @@ get_image_format_properties(const struct brw_device_info *devinfo,
 }
 
 static VkFormatFeatureFlags
-get_buffer_format_properties(const struct brw_device_info *devinfo,
+get_buffer_format_properties(const struct gen_device_info *devinfo,
                              enum isl_format format)
 {
    if (format == ISL_FORMAT_UNSUPPORTED)
diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c
index 52ab7d0bf2d..151073eee5c 100644
--- a/src/intel/vulkan/anv_pipeline.c
+++ b/src/intel/vulkan/anv_pipeline.c
@@ -229,7 +229,7 @@ static const uint32_t vk_to_gen_primitive_type[] = {
 };
 
 static void
-populate_sampler_prog_key(const struct brw_device_info *devinfo,
+populate_sampler_prog_key(const struct gen_device_info *devinfo,
                           struct brw_sampler_prog_key_data *key)
 {
    /* XXX: Handle texture swizzle on HSW- */
@@ -240,7 +240,7 @@ populate_sampler_prog_key(const struct brw_device_info *devinfo,
 }
 
 static void
-populate_vs_prog_key(const struct brw_device_info *devinfo,
+populate_vs_prog_key(const struct gen_device_info *devinfo,
                      struct brw_vs_prog_key *key)
 {
    memset(key, 0, sizeof(*key));
@@ -253,7 +253,7 @@ populate_vs_prog_key(const struct brw_device_info *devinfo,
 }
 
 static void
-populate_gs_prog_key(const struct brw_device_info *devinfo,
+populate_gs_prog_key(const struct gen_device_info *devinfo,
                      struct brw_gs_prog_key *key)
 {
    memset(key, 0, sizeof(*key));
@@ -262,7 +262,7 @@ populate_gs_prog_key(const struct brw_device_info *devinfo,
 }
 
 static void
-populate_wm_prog_key(const struct brw_device_info *devinfo,
+populate_wm_prog_key(const struct gen_device_info *devinfo,
                      const VkGraphicsPipelineCreateInfo *info,
                      const struct anv_graphics_pipeline_create_info *extra,
                      struct brw_wm_prog_key *key)
@@ -304,7 +304,7 @@ populate_wm_prog_key(const struct brw_device_info *devinfo,
 }
 
 static void
-populate_cs_prog_key(const struct brw_device_info *devinfo,
+populate_cs_prog_key(const struct gen_device_info *devinfo,
                      struct brw_cs_prog_key *key)
 {
    memset(key, 0, sizeof(*key));
@@ -806,7 +806,7 @@ anv_pipeline_compile_cs(struct anv_pipeline *pipeline,
 void
 anv_setup_pipeline_l3_config(struct anv_pipeline *pipeline)
 {
-   const struct brw_device_info *devinfo = &pipeline->device->info;
+   const struct gen_device_info *devinfo = &pipeline->device->info;
    switch (devinfo->gen) {
    case 7:
       if (devinfo->is_haswell)
@@ -828,7 +828,7 @@ anv_setup_pipeline_l3_config(struct anv_pipeline *pipeline)
 void
 anv_compute_urb_partition(struct anv_pipeline *pipeline)
 {
-   const struct brw_device_info *devinfo = &pipeline->device->info;
+   const struct gen_device_info *devinfo = &pipeline->device->info;
 
    bool vs_present = pipeline->active_stages & VK_SHADER_STAGE_VERTEX_BIT;
    unsigned vs_size = vs_present ?
diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index 74c1e5ba65f..7cab99e952b 100644
--- a/src/intel/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
@@ -40,7 +40,7 @@
 #define VG(x)
 #endif
 
-#include "common/brw_device_info.h"
+#include "common/gen_device_info.h"
 #include "brw_compiler.h"
 #include "util/macros.h"
 #include "util/list.h"
@@ -563,7 +563,7 @@ struct anv_physical_device {
     uint32_t                                    chipset_id;
     char                                        path[20];
     const char *                                name;
-    const struct brw_device_info *              info;
+    const struct gen_device_info *              info;
     uint64_t                                    aperture_size;
     struct brw_compiler *                       compiler;
     struct isl_device                           isl_dev;
@@ -687,7 +687,7 @@ struct anv_device {
 
     struct anv_instance *                       instance;
     uint32_t                                    chipset_id;
-    struct brw_device_info                      info;
+    struct gen_device_info                      info;
     struct isl_device                           isl_dev;
     int                                         context_id;
     int                                         fd;
@@ -1634,11 +1634,11 @@ struct anv_format {
 };
 
 struct anv_format
-anv_get_format(const struct brw_device_info *devinfo, VkFormat format,
+anv_get_format(const struct gen_device_info *devinfo, VkFormat format,
                VkImageAspectFlags aspect, VkImageTiling tiling);
 
 static inline enum isl_format
-anv_get_isl_format(const struct brw_device_info *devinfo, VkFormat vk_format,
+anv_get_isl_format(const struct gen_device_info *devinfo, VkFormat vk_format,
                    VkImageAspectFlags aspect, VkImageTiling tiling)
 {
    return anv_get_format(devinfo, vk_format, aspect, tiling).isl_format;
diff --git a/src/intel/vulkan/genX_l3.c b/src/intel/vulkan/genX_l3.c
index a74071cf124..36bf57c35b9 100644
--- a/src/intel/vulkan/genX_l3.c
+++ b/src/intel/vulkan/genX_l3.c
@@ -151,7 +151,7 @@ static const struct anv_l3_config chv_l3_configs[] = {
  * specified device.
  */
 static inline const struct anv_l3_config *
-get_l3_configs(const struct brw_device_info *devinfo)
+get_l3_configs(const struct gen_device_info *devinfo)
 {
    assert(devinfo->gen == GEN_GEN);
 #if GEN_IS_HASWELL
@@ -171,7 +171,7 @@ get_l3_configs(const struct brw_device_info *devinfo)
  * Return the size of an L3 way in KB.
  */
 static unsigned
-get_l3_way_size(const struct brw_device_info *devinfo)
+get_l3_way_size(const struct gen_device_info *devinfo)
 {
    if (devinfo->is_baytrail)
       return 2;
@@ -260,7 +260,7 @@ diff_l3_weights(struct anv_l3_weights w0, struct anv_l3_weights w1)
  * weight vector.
  */
 static const struct anv_l3_config *
-get_l3_config(const struct brw_device_info *devinfo, struct anv_l3_weights w0)
+get_l3_config(const struct gen_device_info *devinfo, struct anv_l3_weights w0)
 {
    const struct anv_l3_config *const cfgs = get_l3_configs(devinfo);
    const struct anv_l3_config *cfg_best = NULL;
@@ -284,7 +284,7 @@ get_l3_config(const struct brw_device_info *devinfo, struct anv_l3_weights w0)
  * is intended to approximately resemble the hardware defaults.
  */
 static struct anv_l3_weights
-get_default_l3_weights(const struct brw_device_info *devinfo,
+get_default_l3_weights(const struct gen_device_info *devinfo,
                        bool needs_dc, bool needs_slm)
 {
    struct anv_l3_weights w = {{ 0 }};
@@ -418,7 +418,7 @@ setup_l3_config(struct anv_cmd_buffer *cmd_buffer/*, struct brw_context *brw*/,
     * client (URB for all validated configurations) set to the
     * lower-bandwidth 2-bank address hashing mode.
     */
-   const struct brw_device_info *devinfo = &cmd_buffer->device->info;
+   const struct gen_device_info *devinfo = &cmd_buffer->device->info;
    const bool urb_low_bw = has_slm && !devinfo->is_baytrail;
    assert(!urb_low_bw || cfg->n[L3P_URB] == cfg->n[L3P_SLM]);
 
@@ -481,10 +481,10 @@ setup_l3_config(struct anv_cmd_buffer *cmd_buffer/*, struct brw_context *brw*/,
 
 /**
  * Return the unit brw_context::urb::size is expressed in, in KB.  \sa
- * brw_device_info::urb::size.
+ * gen_device_info::urb::size.
  */
 static unsigned
-get_urb_size_scale(const struct brw_device_info *devinfo)
+get_urb_size_scale(const struct gen_device_info *devinfo)
 {
    return (devinfo->gen >= 8 ? devinfo->num_slices : 1);
 }
@@ -493,7 +493,7 @@ void
 genX(setup_pipeline_l3_config)(struct anv_pipeline *pipeline)
 {
    const struct anv_l3_weights w = get_pipeline_state_l3_weights(pipeline);
-   const struct brw_device_info *devinfo = &pipeline->device->info;
+   const struct gen_device_info *devinfo = &pipeline->device->info;
    const struct anv_l3_config *const cfg = get_l3_config(devinfo, w);
    pipeline->urb.l3_config = cfg;