intel: Rename brw_get_device_name/info to gen_get_device_name/info

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

diff --git a/src/intel/common/gen_device_info.c b/src/intel/common/gen_device_info.c
index 6ee55e187fcfe77319f443ab035d24e216329514..7f1af19f98c4bde831e4e1b6ed8f79d6a563345f 100644 (file)
--- a/src/intel/common/gen_device_info.c
+++ b/src/intel/common/gen_device_info.c
@@ -488,7 +488,7 @@ static const struct gen_device_info gen_device_info_kbl_gt4 = {
 };
 
 const struct gen_device_info *
-brw_get_device_info(int devid)
+gen_get_device_info(int devid)
 {
    const struct gen_device_info *devinfo;
    switch (devid) {
@@ -505,7 +505,7 @@ brw_get_device_info(int devid)
 }
 
 const char *
-brw_get_device_name(int devid)
+gen_get_device_name(int devid)
 {
    switch (devid) {
 #undef CHIPSET

diff --git a/src/intel/common/gen_device_info.h b/src/intel/common/gen_device_info.h
index ea1b75068ccbcc3514e09ee3f1cdff6d58ec45bd..6b639d397a057b7d183e1aecef595e64b27626f7 100644 (file)
--- a/src/intel/common/gen_device_info.h
+++ b/src/intel/common/gen_device_info.h
@@ -143,5 +143,5 @@ struct gen_device_info
    /** @} */
 };
 
-const struct gen_device_info *brw_get_device_info(int devid);
-const char *brw_get_device_name(int devid);
+const struct gen_device_info *gen_get_device_info(int devid);
+const char *gen_get_device_name(int devid);

diff --git a/src/intel/isl/tests/isl_surf_get_image_offset_test.c b/src/intel/isl/tests/isl_surf_get_image_offset_test.c
index 8c44b37dc06244aabd7466e80e91bec2691a8c5f..5ce326f7cd076d41eb35cc61f1242854f0a238dc 100644 (file)
--- a/src/intel/isl/tests/isl_surf_get_image_offset_test.c
+++ b/src/intel/isl/tests/isl_surf_get_image_offset_test.c
@@ -125,7 +125,7 @@ test_bdw_2d_r8g8b8a8_unorm_512x512_array01_samples01_noaux_tiley0(void)
    bool ok;
 
    struct isl_device dev;
-   isl_device_init(&dev, brw_get_device_info(BDW_GT2_DEVID),
+   isl_device_init(&dev, gen_get_device_info(BDW_GT2_DEVID),
                    /*bit6_swizzle*/ false);
 
    struct isl_surf surf;
@@ -171,7 +171,7 @@ test_bdw_2d_r8g8b8a8_unorm_1024x1024_array06_samples01_noaux_tiley0(void)
    bool ok;
 
    struct isl_device dev;
-   isl_device_init(&dev, brw_get_device_info(BDW_GT2_DEVID),
+   isl_device_init(&dev, gen_get_device_info(BDW_GT2_DEVID),
                    /*bit6_swizzle*/ false);
 
    struct isl_surf surf;
@@ -230,7 +230,7 @@ test_bdw_3d_r8g8b8a8_unorm_256x256x256_levels09_tiley0(void)
    bool ok;
 
    struct isl_device dev;
-   isl_device_init(&dev, brw_get_device_info(BDW_GT2_DEVID),
+   isl_device_init(&dev, gen_get_device_info(BDW_GT2_DEVID),
                    /*bit6_swizzle*/ false);
 
    struct isl_surf surf;

diff --git a/src/intel/tools/disasm.c b/src/intel/tools/disasm.c
index 29c06413ab9e8be38a41c34e16fd0e5b42e40633..ddbfa9fe0feef9895a124910b0da547ced61aa0b 100644 (file)
--- a/src/intel/tools/disasm.c
+++ b/src/intel/tools/disasm.c
@@ -95,7 +95,7 @@ gen_disasm_create(int pciid)
    if (gd == NULL)
       return NULL;
 
-   dev_info = brw_get_device_info(pciid);
+   dev_info = gen_get_device_info(pciid);
 
    gd->devinfo.gen = dev_info->gen;
    gd->devinfo.is_cherryview = dev_info->is_cherryview;

diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index 08dfa18defe0dcec4adf0075869de7f53ba8f7ab..73174938c796fb2d639f99d21def0ef3652e1674 100644 (file)
--- a/src/intel/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
@@ -76,8 +76,8 @@ anv_physical_device_init(struct anv_physical_device *device,
       goto fail;
    }
 
-   device->name = brw_get_device_name(device->chipset_id);
-   device->info = brw_get_device_info(device->chipset_id);
+   device->name = gen_get_device_name(device->chipset_id);
+   device->info = gen_get_device_info(device->chipset_id);
    if (!device->info) {
       result = vk_error(VK_ERROR_INCOMPATIBLE_DRIVER);
       goto fail;

diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index d3f3ae1c699919f122ed47340aebfa9eda438da2..b880b4fd3d8f32f901fcc668cc86952a6d14b955 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -782,7 +782,7 @@ brw_initialize_cs_context_constants(struct brw_context *brw)
 {
    struct gl_context *ctx = &brw->ctx;
    const struct intel_screen *screen = brw->intelScreen;
-   const struct brw_device_info *devinfo = screen->devinfo;
+   const struct gen_device_info *devinfo = screen->devinfo;
 
    /* FINISHME: Do this for all platforms that the kernel supports */
    if (brw->is_cherryview &&

diff --git a/src/mesa/drivers/dri/i965/brw_disasm.c b/src/mesa/drivers/dri/i965/brw_disasm.c
index 32cf134ea8f1c471fa766e6fe1bc443528c28f8c..5e51be7974882a7a3ef6ab66b9abb016c47d43ed 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_disasm.c
+++ b/src/mesa/drivers/dri/i965/brw_disasm.c
@@ -404,7 +404,7 @@ static const char *const dp_rc_msg_type_gen9[16] = {
 };
 
 static const char *const *
-dp_rc_msg_type(const struct brw_device_info *devinfo)
+dp_rc_msg_type(const struct gen_device_info *devinfo)
 {
    return (devinfo->gen >= 9 ? dp_rc_msg_type_gen9 :
            devinfo->gen >= 7 ? dp_rc_msg_type_gen7 :

diff --git a/src/mesa/drivers/dri/i965/brw_eu_emit.c b/src/mesa/drivers/dri/i965/brw_eu_emit.c
index da6354e587a7152eeca784826d0ca0e4413fdc33..3b12030ec0c1f66562b3c8e4b4ae73b293e2f4d5 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_eu_emit.c
+++ b/src/mesa/drivers/dri/i965/brw_eu_emit.c
@@ -2417,7 +2417,7 @@ gen9_fb_READ(struct brw_codegen *p,
              unsigned response_length,
              bool per_sample)
 {
-   const struct brw_device_info *devinfo = p->devinfo;
+   const struct gen_device_info *devinfo = p->devinfo;
    assert(devinfo->gen >= 9);
    const unsigned msg_subtype =
       brw_inst_exec_size(devinfo, p->current) == BRW_EXECUTE_16 ? 0 : 1;

diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
index 0ea10eee4a0799f243a67c76be39e9dfb9614381..eae726d8e1ccdaaf609a5327698e7b43fad65ba2 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
@@ -3151,7 +3151,7 @@ fs_inst *
 fs_visitor::emit_non_coherent_fb_read(const fs_builder &bld, const fs_reg &dst,
                                       unsigned target)
 {
-   const struct brw_device_info *devinfo = bld.shader->devinfo;
+   const struct gen_device_info *devinfo = bld.shader->devinfo;
 
    assert(bld.shader->stage == MESA_SHADER_FRAGMENT);
    const brw_wm_prog_key *wm_key =

diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
index 08beea86447bb73138285085918cf7f3d0600396..7b971839a0a12a7539f38a3c6acb51ad66d5cdbb 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
@@ -3063,7 +3063,7 @@ get_isl_surf_dim(GLenum target)
 }
 
 enum isl_dim_layout
-get_isl_dim_layout(const struct brw_device_info *devinfo, uint32_t tiling,
+get_isl_dim_layout(const struct gen_device_info *devinfo, uint32_t tiling,
                    GLenum target)
 {
    switch (target) {

diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h
index 27dbfa49e030978177df4aa1a9ca64f549b65636..07db51b305e8b2af16f859cd425c7e8a366119cc 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h
@@ -813,7 +813,7 @@ enum isl_surf_dim
 get_isl_surf_dim(GLenum target);
 
 enum isl_dim_layout
-get_isl_dim_layout(const struct brw_device_info *devinfo, uint32_t tiling,
+get_isl_dim_layout(const struct gen_device_info *devinfo, uint32_t tiling,
                    GLenum target);
 
 void

diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index c431839b144bd819eeff9f598ed13f9d659905e7..a3d252d030ddb613ef886f2bdfe0b2712d6a06ee 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -1563,7 +1563,7 @@ __DRIconfig **intelInitScreen2(__DRIscreen *psp)
        return false;
 
    intelScreen->deviceID = drm_intel_bufmgr_gem_get_devid(intelScreen->bufmgr);
-   intelScreen->devinfo = brw_get_device_info(intelScreen->deviceID);
+   intelScreen->devinfo = gen_get_device_info(intelScreen->deviceID);
    if (!intelScreen->devinfo)
       return false;