qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-31 05:00:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

[vulkan] Clean up QFV_duSetObjectName usage a little

Browse source 
Moving the param calculations into QFV_duSetObjectName params prevents
warnings when debug is disabled without having to use (void) hacks.
This commit is contained in:
Bill Currie 2022-10-02 15:07:04 +09:00
parent 9798400cfb
commit ac8d71733e
2 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
libs/video/renderer/vulkan/resource.c
View file

@ -55,13 +55,12 @@ QFV_CreateResource (qfv_device_t *device, qfv_resource_t *resource)
buffer->buffer = QFV_CreateBuffer (device,
buffer->size,
buffer->usage);
const char *name = va (resource->va_ctx, "buffer:%s:%s",
resource->name, obj->name);
QFV_duSetObjectName (device, VK_OBJECT_TYPE_BUFFER,
buffer->buffer, name);
buffer->buffer,
va (resource->va_ctx, "buffer:%s:%s",
resource->name, obj->name));
dfunc->vkGetBufferMemoryRequirements (device->dev,
buffer->buffer, &req);
(void) name; // for when QFV_duSetObjectName is empty
}
break;
case qfv_res_buffer_view:
@ -87,13 +86,12 @@ QFV_CreateResource (qfv_device_t *device, qfv_resource_t *resource)
image->num_layers,
image->samples,
image->usage);
const char *name = va (resource->va_ctx, "image:%s:%s",
resource->name, obj->name);
QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE,
image->image, name);
image->image,
va (resource->va_ctx, "image:%s:%s",
resource->name, obj->name));
dfunc->vkGetImageMemoryRequirements (device->dev,
image->image, &req);
(void) name; // for when QFV_duSetObjectName is empty
}
break;
case qfv_res_image_view:
@ -197,11 +195,10 @@ QFV_CreateResource (qfv_device_t *device, qfv_resource_t *resource)
buffview->format,
buffview->offset,
buffview->size);
const char *name = va (resource->va_ctx, "bview:%s:%s",
resource->name, obj->name);
QFV_duSetObjectName (device, VK_OBJECT_TYPE_BUFFER_VIEW,
buffview->view, name);
(void) name; // for when QFV_duSetObjectName is empty
buffview->view,
va (resource->va_ctx, "bview:%s:%s",
resource->name, obj->name));
}
break;
case qfv_res_image_view:
@ -214,11 +211,10 @@ QFV_CreateResource (qfv_device_t *device, qfv_resource_t *resource)
imgview->type,
imgview->format,
imgview->aspect);
const char *name = va (resource->va_ctx, "iview:%s:%s",
resource->name, obj->name);
QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE_VIEW,
imgview->view, name);
(void) name; // for when QFV_duSetObjectName is empty
imgview->view,
va (resource->va_ctx, "iview:%s:%s",
resource->name, obj->name));
}
break;
}

3
libs/video/renderer/vulkan/vulkan_texture.c
View file

@ -481,8 +481,7 @@ Vulkan_Texture_Init (vulkan_ctx_t *ctx)
VK_IMAGE_VIEW_TYPE_2D_ARRAY,
VK_FORMAT_R8G8B8A8_UNORM,
VK_IMAGE_ASPECT_COLOR_BIT);
qfv_device_t *device = ctx->device;
QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE_VIEW, tex->view,
QFV_duSetObjectName (ctx->device, VK_OBJECT_TYPE_IMAGE_VIEW, tex->view,
"iview:default_magenta_array");
qfvPopDebug (ctx);
}