radv: make use of ATI_VENDOR_ID everywhere

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 9e654a511f3815f263fb696a0b0d517159057bda..6171408ced15b55ffbefbb120f2de3b8e7fcd758 100644 (file)
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -564,7 +564,7 @@ radv_enumerate_devices(struct radv_instance *instance)
        for (unsigned i = 0; i < (unsigned)max_devices; i++) {
                if (devices[i]->available_nodes & 1 << DRM_NODE_RENDER &&
                    devices[i]->bustype == DRM_BUS_PCI &&
-                   devices[i]->deviceinfo.pci->vendor_id == 0x1002) {
+                   devices[i]->deviceinfo.pci->vendor_id == ATI_VENDOR_ID) {
 
                        result = radv_physical_device_init(instance->physicalDevices +
                                                           instance->physicalDeviceCount,
@@ -827,7 +827,7 @@ void radv_GetPhysicalDeviceProperties(
        *pProperties = (VkPhysicalDeviceProperties) {
                .apiVersion = VK_MAKE_VERSION(1, 0, 42),
                .driverVersion = vk_get_driver_version(),
-               .vendorID = 0x1002,
+               .vendorID = ATI_VENDOR_ID,
                .deviceID = pdevice->rad_info.pci_id,
                .deviceType = pdevice->rad_info.has_dedicated_vram ? VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU : VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU,
                .limits = limits,

diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c
index cff1b8d03f87d82423ee179d8d34d6b4a33988cb..c96e9e66e14159dd4c8cb16535e6f493f5532735 100644 (file)
--- a/src/amd/vulkan/radv_image.c
+++ b/src/amd/vulkan/radv_image.c
@@ -147,7 +147,7 @@ radv_init_surface(struct radv_device *device,
                surface->flags |= RADEON_SURF_SCANOUT;
        return 0;
 }
-#define ATI_VENDOR_ID 0x1002
+
 static uint32_t si_get_bo_metadata_word1(struct radv_device *device)
 {
        return (ATI_VENDOR_ID << 16) | device->physical_device->rad_info.pci_id;

diff --git a/src/amd/vulkan/radv_pipeline_cache.c b/src/amd/vulkan/radv_pipeline_cache.c
index ba5104339ac33423f81bc077fd374086a7f974c4..fa760f31eeec147f698a4c11a59e1a40a61172b4 100644 (file)
--- a/src/amd/vulkan/radv_pipeline_cache.c
+++ b/src/amd/vulkan/radv_pipeline_cache.c
@@ -330,7 +330,7 @@ radv_pipeline_cache_load(struct radv_pipeline_cache *cache,
                return;
        if (header.header_version != VK_PIPELINE_CACHE_HEADER_VERSION_ONE)
                return;
-       if (header.vendor_id != 0x1002)
+       if (header.vendor_id != ATI_VENDOR_ID)
                return;
        if (header.device_id != device->physical_device->rad_info.pci_id)
                return;
@@ -431,7 +431,7 @@ VkResult radv_GetPipelineCacheData(
        header = p;
        header->header_size = sizeof(*header);
        header->header_version = VK_PIPELINE_CACHE_HEADER_VERSION_ONE;
-       header->vendor_id = 0x1002;
+       header->vendor_id = ATI_VENDOR_ID;
        header->device_id = device->physical_device->rad_info.pci_id;
        memcpy(header->uuid, device->physical_device->cache_uuid, VK_UUID_SIZE);
        p += header->header_size;

diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index f9853df5a3fef8d5662de7cad2fd6193738cbc4c..b2983879299848150c0dcfa1c343fcbdb8847412 100644 (file)
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -74,6 +74,8 @@ typedef uint32_t xcb_window_t;
 
 #include "wsi_common.h"
 
+#define ATI_VENDOR_ID 0x1002
+
 #define MAX_VBS         32
 #define MAX_VERTEX_ATTRIBS 32
 #define MAX_RTS          8