qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-03-22 10:21:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

[vulkan] Add an array view for default_magenta

Browse source 
The validation layers get very picky about image view types (rightfully
so, I imagine).
This commit is contained in:
Bill Currie 2021-12-08 21:08:37 +09:00
parent 2740f6093b
commit 6fbce335bb
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/vid_vulkan.h
View file

@ -80,6 +80,7 @@ typedef struct vulkan_ctx_s {
struct qfv_tex_s *default_black;
struct qfv_tex_s *default_white;
struct qfv_tex_s *default_magenta;
struct qfv_tex_s *default_magenta_array;
VkViewport viewport;
VkRect2D scissor;

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

@ -404,9 +404,15 @@ Vulkan_UnloadTex (vulkan_ctx_t *ctx, qfv_tex_t *tex)
qfv_device_t *device = ctx->device;
qfv_devfuncs_t *dfunc = device->funcs;
dfunc->vkDestroyImageView (device->dev, tex->view, 0);
dfunc->vkDestroyImage (device->dev, tex->image, 0);
dfunc->vkFreeMemory (device->dev, tex->memory, 0);
if (tex->view) {
dfunc->vkDestroyImageView (device->dev, tex->view, 0);
}
if (tex->image) {
dfunc->vkDestroyImage (device->dev, tex->image, 0);
}
if (tex->memory) {
dfunc->vkFreeMemory (device->dev, tex->memory, 0);
}
free (tex);
}
@ -426,6 +432,14 @@ Vulkan_Texture_Init (vulkan_ctx_t *ctx)
"default_white");
ctx->default_magenta = Vulkan_LoadTex (ctx, &default_magenta_tex, 1,
"default_magenta");
qfv_tex_t *tex;
tex = ctx->default_magenta_array = malloc (sizeof (qfv_tex_t));
tex->memory = 0;
tex->image = 0;
tex->view = QFV_CreateImageView (ctx->device, ctx->default_magenta->image,
VK_IMAGE_VIEW_TYPE_2D_ARRAY,
VK_FORMAT_R8G8B8A8_UNORM,
VK_IMAGE_ASPECT_COLOR_BIT);
}
void
@ -434,4 +448,5 @@ Vulkan_Texture_Shutdown (vulkan_ctx_t *ctx)
Vulkan_UnloadTex (ctx, ctx->default_black);
Vulkan_UnloadTex (ctx, ctx->default_white);
Vulkan_UnloadTex (ctx, ctx->default_magenta);
Vulkan_UnloadTex (ctx, ctx->default_magenta_array);
}