fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 22:18:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Revert "vulkan: Make vk_debug_report_callback derive from vk_object_base"

Browse source 
This reverts commit ca39949a27.
This commit is contained in:
Dylan Baker 2021-02-18 11:29:07 -08:00
parent 86a28983dd
commit 0ce1f09101
3 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -8221,7 +8221,7 @@
"description": "vulkan: Make vk_debug_report_callback derive from vk_object_base",
"nominated": true,
"nomination_type": 1,
"resolution": 1,
"resolution": 0,
"master_sha": null,
"because_sha": "51c6bc13ce3a70b1948ce5c4edbc1d29c5460986"
},

15
src/vulkan/util/vk_debug_report.c
View file

@ -58,9 +58,6 @@ vk_create_debug_report_callback(struct vk_debug_report_instance *instance,
if (!cb)
return VK_ERROR_OUT_OF_HOST_MEMORY;
vk_object_base_init(NULL, &cb->base,
VK_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT);
cb->flags = pCreateInfo->flags;
cb->callback = pCreateInfo->pfnCallback;
cb->data = pCreateInfo->pUserData;
@ -69,7 +66,7 @@ vk_create_debug_report_callback(struct vk_debug_report_instance *instance,
list_addtail(&cb->link, &instance->callbacks);
mtx_unlock(&instance->callbacks_mutex);
*pCallback = vk_debug_report_callback_to_handle(cb);
*pCallback = (VkDebugReportCallbackEXT)(uintptr_t)cb;
return VK_SUCCESS;
}
@ -80,20 +77,20 @@ vk_destroy_debug_report_callback(struct vk_debug_report_instance *instance,
const VkAllocationCallbacks* pAllocator,
const VkAllocationCallbacks* instance_allocator)
{
VK_FROM_HANDLE(vk_debug_report_callback, callback, _callback);
if (callback == NULL)
if (_callback == VK_NULL_HANDLE)
return;
struct vk_debug_report_callback *callback =
(struct vk_debug_report_callback *)(uintptr_t)_callback;
/* Remove from list and destroy given callback. */
mtx_lock(&instance->callbacks_mutex);
list_del(&callback->link);
vk_free2(instance_allocator, pAllocator, callback);
mtx_unlock(&instance->callbacks_mutex);
vk_object_base_finish(&callback->base);
}
void
vk_debug_report(struct vk_debug_report_instance *instance,
VkDebugReportFlagsEXT flags,

7
src/vulkan/util/vk_debug_report.h
View file

@ -26,15 +26,11 @@
#ifndef VK_DEBUG_REPORT_H
#define VK_DEBUG_REPORT_H
#include "vk_object.h"
#include "c11/threads.h"
#include "util/list.h"
#include <vulkan/vulkan.h>
struct vk_debug_report_callback {
struct vk_object_base base;
/* Link in the 'callbacks' list in anv_instance struct. */
struct list_head link;
VkDebugReportFlagsEXT flags;
@ -42,9 +38,6 @@ struct vk_debug_report_callback {
void * data;
};
VK_DEFINE_HANDLE_CASTS(vk_debug_report_callback, base, VkDebugReportCallbackEXT,
VK_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT)
struct vk_debug_report_instance {
/* VK_EXT_debug_report debug callbacks */
mtx_t callbacks_mutex;