diff --git a/src/amd/vulkan/radv_physical_device.c b/src/amd/vulkan/radv_physical_device.c index e8873994d7d..81d47ec4a6c 100644 --- a/src/amd/vulkan/radv_physical_device.c +++ b/src/amd/vulkan/radv_physical_device.c @@ -2134,7 +2134,7 @@ radv_get_physical_device_properties(struct radv_physical_device *pdev) .imageViewCaptureReplayDescriptorDataSize = 1, .samplerCaptureReplayDescriptorDataSize = 4, .accelerationStructureCaptureReplayDescriptorDataSize = 1, - .samplerDescriptorSize = RADV_SAMPLER_DESC_SIZE, + .EDBsamplerDescriptorSize = RADV_SAMPLER_DESC_SIZE, .combinedImageSamplerDescriptorSize = radv_get_combined_image_sampler_desc_size(pdev), .sampledImageDescriptorSize = radv_get_sampled_image_desc_size(pdev), .storageImageDescriptorSize = RADV_STORAGE_IMAGE_DESC_SIZE, diff --git a/src/freedreno/vulkan/tu_device.cc b/src/freedreno/vulkan/tu_device.cc index d013a9a8639..236dacfcd49 100644 --- a/src/freedreno/vulkan/tu_device.cc +++ b/src/freedreno/vulkan/tu_device.cc @@ -1394,7 +1394,7 @@ tu_get_properties(struct tu_physical_device *pdevice, props->samplerCaptureReplayDescriptorDataSize = 0; props->accelerationStructureCaptureReplayDescriptorDataSize = 0; /* Note: these sizes must match descriptor_size() */ - props->samplerDescriptorSize = FDL6_TEX_CONST_DWORDS * 4; + props->EDBsamplerDescriptorSize = FDL6_TEX_CONST_DWORDS * 4; props->combinedImageSamplerDescriptorSize = 2 * FDL6_TEX_CONST_DWORDS * 4; props->sampledImageDescriptorSize = FDL6_TEX_CONST_DWORDS * 4; props->storageImageDescriptorSize = FDL6_TEX_CONST_DWORDS * 4; diff --git a/src/gallium/frontends/lavapipe/lvp_device.c b/src/gallium/frontends/lavapipe/lvp_device.c index 187f17ccf1b..9bf728072f1 100644 --- a/src/gallium/frontends/lavapipe/lvp_device.c +++ b/src/gallium/frontends/lavapipe/lvp_device.c @@ -1230,7 +1230,7 @@ lvp_get_properties(const struct lvp_physical_device *device, struct vk_propertie .imageViewCaptureReplayDescriptorDataSize = 0, .samplerCaptureReplayDescriptorDataSize = 0, .accelerationStructureCaptureReplayDescriptorDataSize = 0, - .samplerDescriptorSize = sizeof(struct lp_descriptor), + .EDBsamplerDescriptorSize = sizeof(struct lp_descriptor), .combinedImageSamplerDescriptorSize = sizeof(struct lp_descriptor), .sampledImageDescriptorSize = sizeof(struct lp_descriptor), .storageImageDescriptorSize = sizeof(struct lp_descriptor), diff --git a/src/intel/vulkan/anv_physical_device.c b/src/intel/vulkan/anv_physical_device.c index 802c081b579..cabfa63d395 100644 --- a/src/intel/vulkan/anv_physical_device.c +++ b/src/intel/vulkan/anv_physical_device.c @@ -1715,7 +1715,7 @@ get_properties(const struct anv_physical_device *pdevice, */ props->accelerationStructureCaptureReplayDescriptorDataSize = 0; - props->samplerDescriptorSize = ANV_SAMPLER_STATE_SIZE; + props->EDBsamplerDescriptorSize = ANV_SAMPLER_STATE_SIZE; props->combinedImageSamplerDescriptorSize = align(ANV_SURFACE_STATE_SIZE + ANV_SAMPLER_STATE_SIZE, ANV_SURFACE_STATE_SIZE); props->sampledImageDescriptorSize = ANV_SURFACE_STATE_SIZE; diff --git a/src/nouveau/vulkan/nvk_physical_device.c b/src/nouveau/vulkan/nvk_physical_device.c index 35e1910610f..cc53f018192 100644 --- a/src/nouveau/vulkan/nvk_physical_device.c +++ b/src/nouveau/vulkan/nvk_physical_device.c @@ -1106,7 +1106,7 @@ nvk_get_device_properties(const struct nvk_instance *instance, .samplerCaptureReplayDescriptorDataSize = sizeof(struct nvk_sampler_capture), .accelerationStructureCaptureReplayDescriptorDataSize = 0, // todo - .samplerDescriptorSize = sizeof(struct nvk_sampled_image_descriptor), + .EDBsamplerDescriptorSize = sizeof(struct nvk_sampled_image_descriptor), .combinedImageSamplerDescriptorSize = sizeof(struct nvk_sampled_image_descriptor), .sampledImageDescriptorSize = sizeof(struct nvk_sampled_image_descriptor), .storageImageDescriptorSize = sizeof(struct nvk_storage_image_descriptor), diff --git a/src/vulkan/util/vk_physical_device_properties_gen.py b/src/vulkan/util/vk_physical_device_properties_gen.py index 3ffffbfb26d..8a39fc06526 100644 --- a/src/vulkan/util/vk_physical_device_properties_gen.py +++ b/src/vulkan/util/vk_physical_device_properties_gen.py @@ -58,6 +58,7 @@ RENAMED_PROPERTIES = { ("SubgroupProperties", "supportedStages"): "subgroupSupportedStages", ("SubgroupProperties", "supportedOperations"): "subgroupSupportedOperations", ("SubgroupProperties", "quadOperationsInAllStages"): "subgroupQuadOperationsInAllStages", + ("DescriptorBufferPropertiesEXT", "samplerDescriptorSize"): "EDBsamplerDescriptorSize", } OUT_ARRAYS = {