From a52c8d1d7b244bfff5681f625781c4ac2e14e12e Mon Sep 17 00:00:00 2001 From: Tony Barbour Date: Thu, 9 Jul 2015 17:31:46 -0600 Subject: Bug 14084 - Object Tracker, Image, Generic layers --- icd/common/icd-instance.c | 2 +- icd/nulldrv/nulldrv.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'icd') diff --git a/icd/common/icd-instance.c b/icd/common/icd-instance.c index ae3b2986..449ff984 100644 --- a/icd/common/icd-instance.c +++ b/icd/common/icd-instance.c @@ -187,7 +187,7 @@ void icd_instance_log(const struct icd_instance *instance, for (logger = instance->loggers; logger; logger = logger->next) { if (msg_flags & logger->flags) { - logger->func(msg_flags, obj_type, src_object, location, + logger->func(msg_flags, obj_type, (uint64_t)src_object, location, msg_code, instance->name, msg, logger->user_data); } } diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c index d49dff46..cea36c20 100644 --- a/icd/nulldrv/nulldrv.c +++ b/icd/nulldrv/nulldrv.c @@ -510,7 +510,7 @@ static VkResult nulldrv_viewport_state_create(struct nulldrv_dev *dev, struct nulldrv_dynamic_vp *state; state = (struct nulldrv_dynamic_vp *) nulldrv_base_create(dev, - sizeof(*state), VK_OBJECT_TYPE_DYNAMIC_VP_STATE); + sizeof(*state), VK_OBJECT_TYPE_DYNAMIC_VIEWPORT_STATE); if (!state) return VK_ERROR_OUT_OF_HOST_MEMORY; @@ -526,7 +526,7 @@ static VkResult nulldrv_raster_state_create(struct nulldrv_dev *dev, struct nulldrv_dynamic_rs *state; state = (struct nulldrv_dynamic_rs *) nulldrv_base_create(dev, - sizeof(*state), VK_OBJECT_TYPE_DYNAMIC_RS_STATE); + sizeof(*state), VK_OBJECT_TYPE_DYNAMIC_RASTER_STATE); if (!state) return VK_ERROR_OUT_OF_HOST_MEMORY; @@ -542,7 +542,7 @@ static VkResult nulldrv_blend_state_create(struct nulldrv_dev *dev, struct nulldrv_dynamic_cb *state; state = (struct nulldrv_dynamic_cb *) nulldrv_base_create(dev, - sizeof(*state), VK_OBJECT_TYPE_DYNAMIC_CB_STATE); + sizeof(*state), VK_OBJECT_TYPE_DYNAMIC_COLOR_BLEND_STATE); if (!state) return VK_ERROR_OUT_OF_HOST_MEMORY; @@ -558,7 +558,7 @@ static VkResult nulldrv_ds_state_create(struct nulldrv_dev *dev, struct nulldrv_dynamic_ds *state; state = (struct nulldrv_dynamic_ds *) nulldrv_base_create(dev, - sizeof(*state), VK_OBJECT_TYPE_DYNAMIC_DS_STATE); + sizeof(*state), VK_OBJECT_TYPE_DYNAMIC_DEPTH_STENCIL_STATE); if (!state) return VK_ERROR_OUT_OF_HOST_MEMORY; -- cgit v1.2.3